X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Frename.sh;h=2837223ed6afcdccf493982c40f0fdd8e3578544;hb=9aff19b717bcc242e16d04c34f348fd79ebdd685;hp=2c43d3a7f2c2a6463fb94f98fec174e4ad96fa51;hpb=7e8eec6839205801adddbd6fafb2ceaf7c601d08;p=pspp-builds.git

diff --git a/tests/command/rename.sh b/tests/command/rename.sh
index 2c43d3a7..2837223e 100755
--- a/tests/command/rename.sh
+++ b/tests/command/rename.sh
@@ -5,14 +5,20 @@
 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`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
 
+PSPP=$top_builddir/src/ui/terminal/pspp
+
 
 cleanup()
 {
@@ -70,7 +76,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"
@@ -78,30 +84,27 @@ grep -i Brake $TEMPDIR/rename.sav
 if [ $? -eq 0 ] ; then fail ; fi
 
 activity="compare output"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
-1.1 DATA LIST.  Reading free-form data from the command file.
+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