[sword-devel] testsuite windows patch

Matthew Talbert ransom1982 at gmail.com
Mon Apr 27 18:57:25 MST 2009


This is a patch to fix the testsuite on Windows (MSYS). The tests
output files that have Windows line endings, while the ones they are
comparing to have Unix line endings. The --strip-trailing-cr causes
diff to ignore that. On *nix, it does nothing (is harmless). I suspect
it is harmless on Mac as well, but can't be sure about that.

With this patch all of the tests pass on Windows, except for
verseparsing-utf8, because I'm not building with ICU.

Matthew

Index: runtest.sh
===================================================================
--- runtest.sh  (revision 2353)
+++ runtest.sh  (working copy)
@@ -26,7 +26,7 @@
 fi

 ./$1.sh > $1.try
-BAD=`diff -u $1.try $1.good`
+BAD=`diff -u --strip-trailing-cr $1.try $1.good`
 if [ "$BAD" = "" ]; then
        if [ "$2" = "-q" ]; then
                exit 0



More information about the sword-devel mailing list