projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made BSD diff compatible
[pspp-builds.git]
/
tests
/
command
/
match-files.sh
diff --git
a/tests/command/match-files.sh
b/tests/command/match-files.sh
index ef2714bddfd4fef1d1cd170ef1f96a0043519e6e..7864921f72d1208075422900440631495e7deef3 100755
(executable)
--- a/
tests/command/match-files.sh
+++ b/
tests/command/match-files.sh
@@
-165,7
+165,9
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
- diff -b -w -B pspp.list $types.out
+ perl -pi -e 's/^\s*$//g' pspp.list
+ perl -pi -e 's/^\s*$//g' $types.out
+ diff -b -w pspp.list $types.out
if [ $? -ne 0 ] ; then fail ; fi
done
done
if [ $? -ne 0 ] ; then fail ; fi
done
done
@@
-188,7
+190,8
@@
$SUPERVISOR $here/../src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
-diff -b -w -B - pspp.list <<EOF
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b -w - pspp.list <<EOF |perl -e 's/^\s*$//g'
A B C D E F
- - - - - -
0 a A 1 b N
A B C D E F
- - - - - -
0 a A 1 b N
@@
-236,7
+239,8
@@
$SUPERVISOR $here/../src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
-diff -b -w -B - pspp.list <<EOF
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b -w - pspp.list <<EOF | perl -e 's/^\s*$//g'
x z y
-------- -------- --------
3.00 8.00 30.00
x z y
-------- -------- --------
3.00 8.00 30.00