X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-1-sample-missing-anal.sh;h=7694349142936ca42f54fc5683027e12203b6575;hb=b7630569df28b3056ab190e5cc635fdb261e895d;hp=7491e43dcb6755e8bf113ce1e17746c30e4af867;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp diff --git a/tests/command/t-test-1-sample-missing-anal.sh b/tests/command/t-test-1-sample-missing-anal.sh index 7491e43dcb..7694349142 100755 --- a/tests/command/t-test-1-sample-missing-anal.sh +++ b/tests/command/t-test-1-sample-missing-anal.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps 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 top_srcdir=`cd $top_srcdir; pwd` @@ -20,6 +21,10 @@ export STAT_CONFIG_PATH cleanup() { + if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then + echo "NOT cleaning $TEMPDIR" + return ; + fi cd / rm -rf $TEMPDIR } @@ -70,11 +75,11 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o pspp.csv $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" -cp $TEMPDIR/pspp.list $TEMPDIR/ref.list +cp $TEMPDIR/pspp.csv $TEMPDIR/ref.csv if [ $? -ne 0 ] ; then no_result ; fi @@ -96,11 +101,11 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o pspp.csv $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare outputs" -diff $TEMPDIR/ref.list $TEMPDIR/pspp.list +diff $TEMPDIR/ref.csv $TEMPDIR/pspp.csv if [ $? -ne 0 ] ; then fail ; fi