Fix tests/command/sample.sh test on Mingw. origin/mingw fc11-i386-build25 fc11-x64-build23 lenny-x64-build46 sid-i386-build93
authorBen Pfaff <blp@gnu.org>
Sun, 18 Oct 2009 00:12:58 +0000 (17:12 -0700)
committerBen Pfaff <blp@gnu.org>
Sun, 18 Oct 2009 00:12:58 +0000 (17:12 -0700)
On Mingw pspp.list contains CR-LF line ends, so the "grep" command to
skip blank lines needs to allow for that.

tests/command/sample.sh

index 0dfd0778a3af16ab6c20e7f6cbf2e0e0707cce01..fc856a4adfbfc2f0ccab2743d482d5cb30582157 100755 (executable)
@@ -85,7 +85,7 @@ $SUPERVISOR $PSPP --testing-mode $TEMPDIR/sample.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create head"
-grep -v '^*$' $TEMPDIR/pspp.list | head -2 > $TEMPDIR/head
+grep -v '^\r]*$' $TEMPDIR/pspp.list | head -2 > $TEMPDIR/head
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="extract data"