Rewrite PSPP output engine.

[pspp-builds.git] / tests / stats / ntiles.sh

diff --git a/tests/stats/ntiles.sh b/tests/stats/ntiles.sh
index 7cea4f24415278d757c163a2e6b14b188c7f7925..4f4eedb15eedc208deb0bc9bba4e4e9279de0284 100755 (executable)
--- a/tests/stats/ntiles.sh
+++ b/tests/stats/ntiles.sh
@@ -4,10 +4,14 @@
 
 TEMPDIR=/tmp/pspp-tst-$$
 
-here=`pwd`;
+# ensure that top_builddir  are absolute
+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
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $top_srcdir; pwd`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -15,8 +19,12 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
-     :
 }
 
 
@@ -69,11 +77,11 @@ EOF
 if [ $? -ne 0 ] ; then no_result; fi
 
 activity="run program $i"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="move output"
-cp $TEMPDIR/pspp.list $TEMPDIR/list.ref
+cp $TEMPDIR/pspp.csv $TEMPDIR/list.ref
 if [ $? -ne 0 ] ; then no_result ; fi
 
 i=$[$i+1];
@@ -98,11 +106,11 @@ EOF
 if [ $? -ne 0 ] ; then no_result; fi
 
 activity="run program $i"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff $TEMPDIR/pspp.list $TEMPDIR/list.ref
+diff $TEMPDIR/pspp.csv $TEMPDIR/list.ref
 if [ $? -ne 0 ] ; then fail; fi