projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite PSPP output engine.
[pspp-builds.git]
/
tests
/
command
/
sysfiles-old.sh
diff --git
a/tests/command/sysfiles-old.sh
b/tests/command/sysfiles-old.sh
index c842b3399e613948104116b0a7f83e0d9f041611..e136a0b209eefc347b8ec371e57e49d4059a35ea 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
@@
-18,6
+22,11
@@
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
}
@@
-64,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'.
@@
-75,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"
@@
-88,18
+97,17
@@
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
--------- -------- -------- --------
- 1.00 1.00 1.00 2.00
- 1.00 1.00 2.00 30.00
- 1.00 2.00 1.00 8.00
- 1.00 2.00 2.00 20.00
- 2.00 1.00 1.00 2.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
-
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+x,variable,variab_a,variab_b
+1.00,1.00,1.00,2.00
+1.00,1.00,2.00,30.00
+1.00,2.00,1.00,8.00
+1.00,2.00,2.00,20.00
+2.00,1.00,1.00,2.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