X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fstats%2Fdescript-mean-bug.sh;h=defe833f041e029f58391e2ea241bebb9e84ffe7;hb=6e43222c13e68dcc68e88b963350a431593e0dc6;hp=d1ebd648739747f08a2d9f915d8287d5fc5188df;hpb=2133a4941da5c903fe08c0961959e89b7d5f7321;p=pspp-builds.git

diff --git a/tests/stats/descript-mean-bug.sh b/tests/stats/descript-mean-bug.sh
index d1ebd648..defe833f 100755
--- a/tests/stats/descript-mean-bug.sh
+++ b/tests/stats/descript-mean-bug.sh
@@ -5,16 +5,22 @@
 
 TEMPDIR=/tmp/pspp-tst-$$
 
-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
 }
 
@@ -48,7 +54,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TEMPDIR/descript.stat <<EOF
-data list notable / x 1.
+data list notable / X 1.
 begin data.
 0
 1
@@ -65,11 +71,12 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/descript.stat
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/descript.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
 1.1 DESCRIPTIVES.  Valid cases = 6; cases with missing value(s) = 0.
 +--------#-+-----+
 |Variable#N| Mean|