projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move global initialization and cleanup code into main.c.
[pspp]
/
tests
/
expressions
/
vectors.sh
diff --git
a/tests/expressions/vectors.sh
b/tests/expressions/vectors.sh
index 8dc563be8496c6924bbaa2c9256b4655c70859cb..c7419a56637aee57081ebdbcf3daf855c1109640 100755
(executable)
--- a/
tests/expressions/vectors.sh
+++ b/
tests/expressions/vectors.sh
@@
-15,6
+15,7
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-72,7
+73,8
@@
$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/vectors.stat > $TEMPDIR/vect
if [ $? -ne 0 ] ; then fail ; fi
activity="compare results"
if [ $? -ne 0 ] ; then fail ; fi
activity="compare results"
-diff -b -B $TEMPDIR/pspp.list - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF
1.1 DATA LIST. Reading 1 record from the command file.
+--------+------+-------+------+
|Variable|Record|Columns|Format|
1.1 DATA LIST. Reading 1 record from the command file.
+--------+------+-------+------+
|Variable|Record|Columns|Format|
@@
-83,7
+85,6
@@
diff -b -B $TEMPDIR/pspp.list - <<EOF
|N4 | 1| 4- 4|F1.0 |
|N5 | 1| 5- 5|F1.0 |
+--------+------+-------+------+
|N4 | 1| 4- 4|F1.0 |
|N5 | 1| 5- 5|F1.0 |
+--------+------+-------+------+
-
N1 N2 N3 N4 N5 X1 X2 X3 X4 X5 I
-- -- -- -- -- -- -- -- -- -- --
1 2 3 4 5 . 3 . . . 5
N1 N2 N3 N4 N5 X1 X2 X3 X4 X5 I
-- -- -- -- -- -- -- -- -- -- --
1 2 3 4 5 . 3 . . . 5