X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Frename.sh;h=ff46486a3f0ef81ae420e90a6bf2da75539f42e0;hb=b9a18d43ace66798d4f2eaaab063fd06b30d5f8f;hp=bb63003c7274cc689236cd9e5042afbe9e7b43ac;hpb=ed7bce25787929340a3f264f00dde7c979e571a9;p=pspp-builds.git

diff --git a/tests/command/rename.sh b/tests/command/rename.sh
index bb63003c..ff46486a 100755
--- a/tests/command/rename.sh
+++ b/tests/command/rename.sh
@@ -5,16 +5,28 @@
 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
+
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -68,7 +80,7 @@ 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="check sysfile"
@@ -76,29 +88,27 @@ grep -i Brake $TEMPDIR/rename.sav
 if [ $? -eq 0 ] ; then fail ; fi
 
 activity="compare output"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
-+--------+------+
-|Variable|Format|
-#========#======#
-|BRAKEFLU|F8.0  |
-|Y       |F8.0  |
-+--------+------+
-
-BRAKEFLU        Y
--------- --------
-    1.00     3.00 
-    2.00     3.00 
-    3.00     3.00 
-    4.00     3.00 
-
-APPLECAR        Y
--------- --------
-    1.00     3.00 
-    2.00     3.00 
-    3.00     3.00 
-    4.00     3.00 
-
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
+1.1 DATA LIST.  Reading free-form data from INLINE.
++----------+------+
+| Variable |Format|
+#==========#======#
+|brakeFluid|F8.0  |
+|y         |F8.0  |
++----------+------+
+brakeFluid        y
+---------- --------
+      1.00     3.00 
+      2.00     3.00 
+      3.00     3.00 
+      4.00     3.00 
+applecarts        y
+---------- --------
+      1.00     3.00 
+      2.00     3.00 
+      3.00     3.00 
+      4.00     3.00 
 EOF
 if [ $? -ne 0 ] ; then fail ; fi