X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-paired-missing-anal.sh;h=d14f812a9ca6aaf1b437386109bcb2b3fcee0f90;hb=ebd0dcdfe65da02a6e541ceea0226c9b0b8d7a47;hp=b0d346470bfa1e402c8c4169b574a3fb75c51cf0;hpb=65a4e29574b67921ea899b6a1d45806dca11db00;p=pspp-builds.git diff --git a/tests/command/t-test-paired-missing-anal.sh b/tests/command/t-test-paired-missing-anal.sh index b0d34647..d14f812a 100755 --- a/tests/command/t-test-paired-missing-anal.sh +++ b/tests/command/t-test-paired-missing-anal.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 } @@ -70,11 +74,11 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o pspp.csv $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" -mv $TEMPDIR/pspp.list $TEMPDIR/ref.list +mv $TEMPDIR/pspp.csv $TEMPDIR/ref.csv if [ $? -ne 0 ] ; then no_result ; fi activity="create program 2" @@ -96,12 +100,12 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $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