X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Frandom.sh;h=e423f3e8b4c6318241adc54718902d22a1697b41;hb=65c4b7fb960b429cc535d3b564a704ee4ebfbed6;hp=1d8b05e729a48a179c7a9c5930d69b03c3e13f1c;hpb=1339492699ce7e12c9bf9fa17f9d60a66024cbd1;p=pspp-builds.git

diff --git a/tests/bugs/random.sh b/tests/bugs/random.sh
index 1d8b05e7..e423f3e8 100755
--- a/tests/bugs/random.sh
+++ b/tests/bugs/random.sh
@@ -6,16 +6,26 @@
 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
 }
 
@@ -58,19 +68,20 @@ input program.
 +    end case.
 + end loop.
 + end file.
-end input program.                                                              
+end input program.
 
 list.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF
       R1
 --------
      7.71 
@@ -93,7 +104,6 @@ diff -b -B -w $TEMPDIR/pspp.list - << EOF
      2.64 
       .88 
      1.50 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi