X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fexpressions%2Fepoch.sh;h=dcbfc0ac4e0d59d650abd12a077db7ed8d562cd4;hb=f51ecb48027e6b1eb46840ae25888a25b429f012;hp=c6e7f1a73f76a604606519c3ca6bdc80271818cf;hpb=4a73877b4d56caed03d383fb4d38347a9774046f;p=pspp

diff --git a/tests/expressions/epoch.sh b/tests/expressions/epoch.sh
index c6e7f1a73f..dcbfc0ac4e 100755
--- a/tests/expressions/epoch.sh
+++ b/tests/expressions/epoch.sh
@@ -4,10 +4,13 @@
 
 TEMPDIR=/tmp/pspp-tst-$$
 
-here=`pwd`;
+# ensure that top_srcdir and top_builddir  are absolute
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+top_srcdir=`cd $top_srcdir; pwd`
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
-# ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -15,6 +18,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -135,7 +142,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out
+$SUPERVISOR $PSPP --testing-mode -o pspp.csv $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out
 
 activity="compare results"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/epoch.out
@@ -211,12 +218,7 @@ DATE.DMY(1,1,87) = DATE.DMY(1,1,2087) => true
 DATE.DMY(1,1,99) = DATE.DMY(1,1,2099) => true
 DATE.DMY(1,1,100) => sysmis
 EOF
-
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-if [ $? -ne 0 ] ; then fail ; fi
-
-
-
 pass;