X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fbugs%2Frandom.sh;h=c7f3e8bee7fee13574a9c1ac98e7fd2de1325863;hb=6fb2b277fd19b32f58cce5fde996208706fc9828;hp=cb7fb06a31780b186a1d610f944ab4896a689f79;hpb=f61e279fa8d35fa2f9c5ef6d5d0e628147ccde60;p=pspp-builds.git

diff --git a/tests/bugs/random.sh b/tests/bugs/random.sh
index cb7fb06a..c7f3e8be 100755
--- a/tests/bugs/random.sh
+++ b/tests/bugs/random.sh
@@ -4,17 +4,24 @@
 
 
 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()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -47,49 +54,52 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/rnd.sps <<EOF
+cat > $TESTFILE <<EOF
 set seed=10.
 input program.
 + loop #i = 1 to 20.
-+    do repeat response=r1.
++    do repeat response=R1.
 +       compute response = uniform(10).
 +    end repeat.
 +    end case.
 + end loop.
 + end file.
-end input program.                                                              
+end input program.
 
 list.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
-$here/../src/pspp -o raw-ascii $TEMPDIR/rnd.sps
+activity="run program"
+$SUPERVISOR $PSPP -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+activity="compare output"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF
       R1
 --------
-    2.36 
-    3.13 
-    1.76 
-     .15 
-    5.88 
-    8.74 
-    2.19 
-    6.53 
-    5.69 
-    6.77 
-    7.20 
-    4.01 
-     .03 
-    4.67 
-    5.10 
-     .44 
-    8.27 
-    6.81 
-    9.55 
-    8.74 
+     7.71 
+     2.99 
+      .21 
+     4.95 
+     6.34 
+     4.43 
+     7.49 
+     8.32 
+     4.99 
+     5.83 
+     2.25 
+      .25 
+     1.98 
+     7.09 
+     7.61 
+     2.66 
+     1.69 
+     2.64 
+      .88 
+     1.50 
 EOF
 if [ $? -ne 0 ] ; then fail ; fi