X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fcompute-lv.sh;h=b0baf4f09cd4272c5e77c773032cd852f75d75c4;hb=75d5c1d6e3253ab1e83abc23b0e7a279ad4ab48b;hp=3d7199421f6e4e185e7e89a39bfc3c49219a25d1;hpb=05e356b2a3087e819ef3b5388e29c822f41502e1;p=pspp-builds.git

diff --git a/tests/bugs/compute-lv.sh b/tests/bugs/compute-lv.sh
index 3d719942..b0baf4f0 100755
--- a/tests/bugs/compute-lv.sh
+++ b/tests/bugs/compute-lv.sh
@@ -5,16 +5,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
 }
 
@@ -64,24 +74,24 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run prog"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 
 activity="compare output"
-diff -B -b pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
-+--------+------+
-|Variable|Format|
-#========#======#
-|LONGVARI|F8.0  |
-|X       |F8.0  |
-+--------+------+
-
-LONGVARI        X 
--------- -------- 
-   99.00     2.00
-   97.00     4.00
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b pspp.list - << EOF
+1.1 DATA LIST.  Reading free-form data from INLINE.
++----------------+------+
+|    Variable    |Format|
+#================#======#
+|longVariablename|F8.0  |
+|x               |F8.0  |
++----------------+------+
+longVariablename        x
+---------------- -------- 
+           99.00     2.00
+           97.00     4.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi