projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fd38d03
)
Fix tests/command/sample.sh test on Mingw.
author
Ben Pfaff
<blp@gnu.org>
Sun, 18 Oct 2009 00:12:58 +0000
(17:12 -0700)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Wed, 26 May 2010 05:06:59 +0000
(22:06 -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
patch
|
blob
|
history
diff --git
a/tests/command/sample.sh
b/tests/command/sample.sh
index 72cc1b5909d65c7a481b978db512a1c9180a0073..eb58b061e39eb17003045b978bea16c52ba65930 100755
(executable)
--- a/
tests/command/sample.sh
+++ b/
tests/command/sample.sh
@@
-85,7
+85,7
@@
$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/sample.stat
if [ $? -ne 0 ] ; then no_result ; fi
activity="create head"
-grep -v '^
\
*$' $TEMPDIR/pspp.csv | head -1 > $TEMPDIR/head
+grep -v '^
[
\r
]
*$' $TEMPDIR/pspp.csv | head -1 > $TEMPDIR/head
if [ $? -ne 0 ] ; then no_result ; fi
activity="extract data"