projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid use of $* in Makefile since it's problematic
[pspp-builds.git]
/
tests
/
command
/
sysfiles-old.sh
diff --git
a/tests/command/sysfiles-old.sh
b/tests/command/sysfiles-old.sh
index 246fc0924f7ff8d07147c68f2a9c253cb634fae1..df16690b01e18bba127ff1f7705e95dd528ecbf2 100755
(executable)
--- a/
tests/command/sysfiles-old.sh
+++ b/
tests/command/sysfiles-old.sh
@@
-7,16
+7,26
@@
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`
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-63,7
+73,7
@@
BEGIN DATA.
END DATA.
SAVE /OUTFILE='$TEMPDIR/foo.sav'
END DATA.
SAVE /OUTFILE='$TEMPDIR/foo.sav'
- /VERSION=
3x
+ /VERSION=
2
.
GET /FILE='$TEMPDIR/foo.sav'.
.
GET /FILE='$TEMPDIR/foo.sav'.
@@
-74,7
+84,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 --testing-mode
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="check file exists"
if [ $? -ne 0 ] ; then no_result ; fi
activity="check file exists"
@@
-87,8
+97,9
@@
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
- X VARIABLE VARIAB_A VARIAB_B
+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
1.00 1.00 2.00 30.00
-------- -------- -------- --------
1.00 1.00 1.00 2.00
1.00 1.00 2.00 30.00
@@
-98,7
+109,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