X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fbig-input-2.sh;h=b0da13bbf3a0af4075e27f87e4ba1ee51e2c2585;hb=f9f1f08ef83eefe0f8db8fc61a637d2d4194ecfb;hp=ee29226bf370390aaefc9783700cc5649b8b3507;hpb=bc51900253384a031401ef7a68674e350dc8225f;p=pspp-builds.git

diff --git a/tests/bugs/big-input-2.sh b/tests/bugs/big-input-2.sh
index ee29226b..b0da13bb 100755
--- a/tests/bugs/big-input-2.sh
+++ b/tests/bugs/big-input-2.sh
@@ -5,17 +5,30 @@
 
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
+TESTFILE=$TEMPDIR/`basename $0`.sps
+: ${PERL:=perl}
 
-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`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -53,26 +66,17 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 printf "Creating input data.  Please wait"
 activity="create data"
-i=0
-while [ $i -lt 100000 ] ; do 
-	echo AB12 >> $TEMPDIR/large.dat;
-	i=$[$i + 1];
-done;
-printf '.'
-i=0
-while [ $i -lt 100000 ] ; do 
-	echo AB04 >> $TEMPDIR/large.dat;
-	i=$[$i + 1];
-done;
+$PERL -e 'for ($i=0; $i<100000; $i++) { print "AB12\n" };
+          for ($i=0; $i<100000; $i++) { print "AB04\n" };' > $TEMPDIR/large.dat
 if [ $? -ne 0 ] ; then no_result ; fi
-printf "\n";
+printf ".\n";
 
 activity="create program"
-cat > $TEMPDIR/large.sps <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST FILE='$TEMPDIR/large.dat' /S 1-2 (A) X 3 .
 
 
-AGGREGATE /BREAK=X /A=N.
+AGGREGATE OUTFILE=* /BREAK=X /A=N.
 
 
 EXAMINE /A BY /X.
@@ -80,24 +84,16 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/large.sps > /dev/null
+$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE 
 if [ $? -ne 0 ] ; then fail ; fi
 
-
 activity="appending to data"
-# Put another 100,000 cases into large.dat
-i=0
-while [ $i -lt 50000 ] ; do 
-	echo AB04 >> $TEMPDIR/large.dat;
-	echo AB12 >> $TEMPDIR/large.dat;
-	i=$[$i + 1];
-done;
+# Put another 50,000 cases into large.dat
+$PERL -e 'for ($i=0; $i<25000; $i++) { print "AB04\nAB12\n" };' >> $TEMPDIR/large.dat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/large.sps > /dev/null
+$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE 
 if [ $? -ne 0 ] ; then fail ; fi
 
-
-
 pass;