Index: tests/runstdtest
===================================================================
RCS file: /cvs/hugs98/tests/runstdtest,v
retrieving revision 1.4
diff -u -r1.4 runstdtest
--- tests/runstdtest	11 Dec 2001 08:37:46 -0000	1.4
+++ tests/runstdtest	28 Jul 2005 23:17:53 -0000
@@ -159,7 +159,7 @@
     myexit=1
 else
     # Pipe that filters out stuff we don't want to check
-    tail +$PgmStartLine ${tmpdir}/runtest$$.1 >${tmpdir}/runtest$$.3
+    tail +$PgmStartLine ${tmpdir}/runtest$$.1 | sed 's/\x0D\$//' >${tmpdir}/runtest$$.3
     for out_file in @PgmStdoutFile ; do
 	$diff \$out_file ${tmpdir}/runtest$$.3 > ${tmpdir}/diffs$$
 	if [ \$? -ne 0 ]; then
Index: tests/testScript
===================================================================
RCS file: /cvs/hugs98/tests/testScript,v
retrieving revision 1.66
diff -u -r1.66 testScript
--- tests/testScript	1 Dec 2004 17:33:22 -0000	1.66
+++ tests/testScript	29 Jul 2005 00:48:09 -0000
@@ -374,7 +374,7 @@
   perl runstdtest $HUGS $STDOPTS    "-Offi/Sparc.hs" "-iffi/Sparc.input" "-o1ffi/Sparc.output"
 
   # This is a pair of tests: first build, then test runtime
-  perl runstdtest $FFIHUGS $STDOPTS "-Offi/Callback.hs" "-Offi/callback.c" "-o1ffi/Empty.output"
+  perl runstdtest $FFIHUGS $STDOPTS "-Offi/Callback.hs" "-Offi/callback_c.c" "-o1ffi/Empty.output"
   perl runstdtest $HUGS $STDOPTS    "-Offi/Callback.hs" "-iffi/Callback.input" "-o1ffi/Callback.output"
 
 } # End of test ffi
Index: tests/libs/system1.hs
===================================================================
RCS file: /cvs/hugs98/tests/libs/system1.hs,v
retrieving revision 1.2
diff -u -r1.2 system1.hs
--- tests/libs/system1.hs	11 Dec 2001 01:07:25 -0000	1.2
+++ tests/libs/system1.hs	29 Jul 2005 01:11:00 -0000
@@ -24,10 +24,11 @@
     then
       putStr "getEnv \"SHELL\" returns known shell"
     else
-      putStr "getEnv \"SHELL\" returns unknown shell"
+      putStr $ "getEnv \"SHELL\" returns \"" ++ shell ++ "\""
   return ()
  where
   shells = ["sh" 
+           ,"sh.exe" -- for MSYS/MinGW
            ,"csh"
            ,"tcsh"
            ,"bash"