From 892c305cc55dda3371400f29a577aecd817d4c3e Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 6 Nov 2007 23:36:25 +0000
Subject: [PATCH] Possible fix for Win32, CR+LF in lines output by unitTest
 code.

---
 src/libCom/test/epicsUnitTestTest.plt | 28 +++++++++++++--------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/libCom/test/epicsUnitTestTest.plt b/src/libCom/test/epicsUnitTestTest.plt
index 204efbeb7..1717ef488 100644
--- a/src/libCom/test/epicsUnitTestTest.plt
+++ b/src/libCom/test/epicsUnitTestTest.plt
@@ -5,21 +5,19 @@ use Test::Simple tests => 1;
 $prog = "./$0";
 $prog =~ s/\.t$//;
 
-$expected = << 'END';
-1..11
-ok  1 - testOk(1)
-not ok  2 - testOk(0)
-ok  3 - testPass()
-not ok  4 - testFail()
-ok  5 # SKIP Skipping two
-ok  6 # SKIP Skipping two
-ok  7 - Todo pass # TODO Testing Todo
-not ok  8 - Todo fail # TODO Testing Todo
-ok  9 # SKIP Todo skip
-ok 10 - testOk1_success
-not ok 11 - testOk1_failure
-# Diagnostic
-END
+$expected = "1..11\n" .
+	    "ok  1 - testOk(1)\n" .
+	    "not ok  2 - testOk(0)\n" .
+	    "ok  3 - testPass()\n" .
+	    "not ok  4 - testFail()\n" .
+	    "ok  5 # SKIP Skipping two\n" .
+	    "ok  6 # SKIP Skipping two\n" .
+	    "ok  7 - Todo pass # TODO Testing Todo\n" .
+	    "not ok  8 - Todo fail # TODO Testing Todo\n" .
+	    "ok  9 # SKIP Todo skip\n" .
+	    "ok 10 - testOk1_success\n" .
+	    "not ok 11 - testOk1_failure\n" .
+	    "# Diagnostic\n";
 
 $ENV{HARNESS_ACTIVE} = 1;
 $result = `$prog`;