X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fcomputebug.sh;h=dfa5990a759cc416209552e6ba60b4f1eb6379cd;hb=400eaca1f378c40dced767bdc14a395dff220b8d;hp=ecc6cb4e33691cf2537b2cda1984ff65865cc1bd;hpb=c912ba11ed1d84c40085177439ac7086f2a43b20;p=pspp-builds.git

diff --git a/tests/bugs/computebug.sh b/tests/bugs/computebug.sh
index ecc6cb4e..dfa5990a 100755
--- a/tests/bugs/computebug.sh
+++ b/tests/bugs/computebug.sh
@@ -1,19 +1,30 @@
 #!/bin/sh
 
-# This program tests ....
+# This program tests for a bug in the `compute' command
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
-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
 }
 
@@ -42,21 +53,24 @@ pass()
 }
 
 mkdir -p $TEMPDIR
-cp $top_srcdir/tests/bugs/computebug.stat $TEMPDIR
-cd $TEMPDIR
 
+activity="copy file"
+cp $top_srcdir/tests/bugs/computebug.stat $TEMPDIR
+if [ $? -ne 0 ] ; then no_result ; fi
 
+activity="chdir"
+cd $TEMPDIR
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $top_srcdir/src/pspp -o raw-ascii $TEMPDIR/computebug.stat
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/computebug.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/computebug.out
-
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list $top_srcdir/tests/bugs/computebug.out
+diff -b -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/computebug.out
 if [ $? -ne 0 ] ; then fail ; fi
 
 pass;