>From 5ed5604d8d248d3aea65422f964064c8a2b059c7 Mon Sep 17 00:00:00 2001
From: Peter Bex <address@hidden>
Date: Sun, 9 Mar 2014 21:34:36 +0100
Subject: [PATCH] Remove dependency on dos2unix, and restore r4rstest diff.

DIFF_OPTS already contains a -w switch, which takes care of line ending differences.
The r4rstest diff is okay now that we're not relying on gcvt() anymore.
---
 tests/runtests.sh |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/tests/runtests.sh b/tests/runtests.sh
index a1bac7a..7065564 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -82,10 +82,6 @@ $compile typematch-tests.scm -specialize -w
 ./a.out
 $compile scrutiny-tests.scm -A -scrutinize -ignore-repository -types $TYPESDB 2>scrutiny.out -verbose
 
-if test -n "$MSYSTEM"; then
-    dos2unix scrutiny.out
-fi
-
 # this is sensitive to gensym-names, so make it optional
 if test \! -f scrutiny.expected; then
     cp scrutiny.out scrutiny.expected
@@ -95,10 +91,6 @@ diff $DIFF_OPTS scrutiny.expected scrutiny.out
 
 $compile scrutiny-tests-2.scm -A -scrutinize -analyze-only -ignore-repository -types $TYPESDB 2>scrutiny-2.out -verbose
 
-if test -n "$MSYSTEM"; then
-    dos2unix scrutiny-2.out
-fi
-
 # this is sensitive to gensym-names, so make it optional
 if test \! -f scrutiny-2.expected; then
     cp scrutiny-2.out scrutiny-2.expected
@@ -261,12 +253,7 @@ echo "(expect mult-float-print-test to fail)"
 $interpret -e '(set! ##sys#procedure->string (constantly "#<procedure>"))' \
   -i -s r4rstest.scm >r4rstest.log
 
-if test -n "$MSYSTEM"; then
-    # the windows runtime library prints flonums differently
-    tail r4rstest.log
-else
-    diff $DIFF_OPTS r4rstest.out r4rstest.log
-fi
+diff $DIFF_OPTS r4rstest.out r4rstest.log
 
 echo "======================================== syntax tests (r5rs_pitfalls) ..."
 echo "(expect two failures)"
-- 
1.7.10.4