X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Ft-test-with-temp.sh;h=3413a51ffb7ba9f57635114022764f907e1e5777;hb=f51ecb48027e6b1eb46840ae25888a25b429f012;hp=e4bc0af4cd18a8017d484fc8e2717a959242997e;hpb=65a4e29574b67921ea899b6a1d45806dca11db00;p=pspp-builds.git diff --git a/tests/bugs/t-test-with-temp.sh b/tests/bugs/t-test-with-temp.sh index e4bc0af4..3413a51f 100755 --- a/tests/bugs/t-test-with-temp.sh +++ b/tests/bugs/t-test-with-temp.sh @@ -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" -$SUPERVISOR $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/first.list +cp $TEMPDIR/pspp.csv $TEMPDIR/first.csv if [ $? -ne 0 ] ; then no_result ; fi activity="create program 2" @@ -99,8 +103,8 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" -perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list $TEMPDIR/first.list -diff -b $TEMPDIR/pspp.list $TEMPDIR/first.list +perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.csv $TEMPDIR/first.csv +diff -b $TEMPDIR/pspp.csv $TEMPDIR/first.csv if [ $? -ne 0 ] ; then fail ; fi