X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-indep-missing-list.sh;h=9820a9209af62da01dfac9e43c8fcaaf7ce2cf96;hb=d019e8a29d7963a926837d46ae3592c5731f02e3;hp=2c7114f1bfb547233335cc1290487347ef7da281;hpb=9aff19b717bcc242e16d04c34f348fd79ebdd685;p=pspp diff --git a/tests/command/t-test-indep-missing-list.sh b/tests/command/t-test-indep-missing-list.sh index 2c7114f1bf..9820a9209a 100755 --- a/tests/command/t-test-indep-missing-list.sh +++ b/tests/command/t-test-indep-missing-list.sh @@ -10,7 +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 +PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -21,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 } @@ -71,11 +75,11 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $PSPP --testing-mode $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 activity="create program 2" @@ -96,12 +100,12 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $PSPP --testing-mode $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