projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix link error noted by Jason Stover.
[pspp-builds.git]
/
tests
/
command
/
sysfiles-old.sh
diff --git
a/tests/command/sysfiles-old.sh
b/tests/command/sysfiles-old.sh
index 6e23c97f8a930a0cb4380e9604d4496045d4e1da..d199172477c40287bba503474ccb4c5115e790ab 100755
(executable)
--- a/
tests/command/sysfiles-old.sh
+++ b/
tests/command/sysfiles-old.sh
@@
-7,10
+7,14
@@
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.sps
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.sps
-here=`pwd`;
+# ensure that top_builddir are absolute
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
# ensure that top_srcdir is absolute
# ensure that top_srcdir is absolute
-
cd $top_srcdir; top_srcdir=`
pwd`
+
top_srcdir=`cd $top_srcdir;
pwd`
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
@@
-76,7
+80,7
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
-$SUPERVISOR $
here/../src/pspp
-o raw-ascii $TESTFILE
+$SUPERVISOR $
PSPP
-o raw-ascii $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="check file exists"
if [ $? -ne 0 ] ; then no_result ; fi
activity="check file exists"
@@
-89,7
+93,8
@@
grep 'X=X' $TEMPDIR/foo.sav
if [ $? -eq 0 ] ; then fail ; fi
activity="compare output"
if [ $? -eq 0 ] ; then fail ; fi
activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b -w $TEMPDIR/pspp.list - << EOF
X VARIABLE VARIAB_A VARIAB_B
-------- -------- -------- --------
1.00 1.00 1.00 2.00
X VARIABLE VARIAB_A VARIAB_B
-------- -------- -------- --------
1.00 1.00 1.00 2.00
@@
-100,7
+105,6
@@
diff -b -B -w $TEMPDIR/pspp.list - << EOF
2.00 1.00 2.00 22.00
2.00 2.00 1.00 1.00
2.00 2.00 2.00 3.00
2.00 1.00 2.00 22.00
2.00 2.00 1.00 1.00
2.00 2.00 2.00 3.00
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi