X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fbugs%2Fmultipass.sh;h=3e0b133943b09fd366af9aed9ecdc4bac476c1a4;hb=3e2bf013a731344daed7ab206d4a3c2460688208;hp=004235478b2dbae62baf0ee6816c887a02abf650;hpb=c323e138c54511b83051ec23543d92ac4630641d;p=pspp-builds.git

diff --git a/tests/bugs/multipass.sh b/tests/bugs/multipass.sh
index 00423547..3e0b1339 100755
--- a/tests/bugs/multipass.sh
+++ b/tests/bugs/multipass.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,8 +54,8 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/rnd.sps <<EOF
-data list list /id * abc *.
+cat > $TESTFILE <<EOF
+data list list /ID * ABC *.
 begin data.
 1 3.5
 2 2.0
@@ -67,19 +74,19 @@ DESCRIPTIVES
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/rnd.sps
+$SUPERVISOR $PSPP -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +--------+------+
 |Variable|Format|
 #========#======#
 |ID      |F8.0  |
 |ABC     |F8.0  |
 +--------+------+
-
 2.1 DESCRIPTIVES.  Valid cases = 6; cases with missing value(s) = 0.
 +--------#-+-----+-------+-------+-------+
 |Variable#N| Mean|Std Dev|Minimum|Maximum|