Greatly simplify PSPP configuration.

[pspp] / tests / command / sort.sh

diff --git a/tests/command/sort.sh b/tests/command/sort.sh
index 1eb4d855ae59560860cf5f0169d32a96bfe2271a..409c11965ffadd42f8578e296d381fc0927d7a81 100755 (executable)
--- a/tests/command/sort.sh
+++ b/tests/command/sort.sh
@@ -4,6 +4,7 @@
 
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
+: ${PERL:=perl}
 
 # ensure that top_builddir  are absolute
 if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
@@ -20,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
 }
@@ -116,7 +121,7 @@ for count_repeat_buffers in \
   } > sort.pspp || no_result
   
   activity="run program"
-  $SUPERVISOR $PSPP --testing-mode -o raw-ascii sort.pspp
+  $SUPERVISOR $PSPP --testing-mode -o pspp.csv sort.pspp
   if [ $? -ne 0 ] ; then no_result ; fi
   
   perl -pi -e 's/^\s*$//g' sort.exp sort.out