X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Flongvars.sh;h=3501f2183f04034748f9c6da83f6499952e815ba;hb=5c3291dc396b795696e94f47780308fd7ace6fc4;hp=54dbcfa4fa5e65ce6d865a351c562bd4af6693b5;hpb=f4b04e8323d4c95c3723ca47587742e7175ae75f;p=pspp-builds.git

diff --git a/tests/command/longvars.sh b/tests/command/longvars.sh
index 54dbcfa4..3501f218 100755
--- a/tests/command/longvars.sh
+++ b/tests/command/longvars.sh
@@ -5,17 +5,27 @@
 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
 
+LANG=C
+export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -67,13 +77,13 @@ 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="compare output"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff  -b $TEMPDIR/pspp.list - <<EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +--------------+------+
 |   Variable   |Format|
 #==============#======#
@@ -96,7 +106,7 @@ AlphaBetaGamma        B        X Yabbadabbadoo
 #X *            #       1|  100.0%|       0|    0.0%|       1|  100.0%#
 #Yabbadabbadoo  #        |        |        |        |        |        #
 #===============#========#========#========#========#========#========#
-2.2 CROSSTABS.  X by Yabbadabbadoo [count].
+2.2 CROSSTABS.  X * Yabbadabbadoo [count].
 #===============#==============================================================#========#
 #               #                         Yabbadabbadoo                        |        #
 #               #--------+--------+--------+--------+--------+--------+--------+        #
@@ -109,7 +119,7 @@ AlphaBetaGamma        B        X Yabbadabbadoo
 #           5.00#      .0|      .0|      .0|      .0|      .0|      .0|      .0|      .0#
 #           6.00#      .0|      .0|      .0|      .0|      .0|      .0|      .0|      .0#
 #           7.00#      .0|      .0|      .0|      .0|      .0|      .0|      .0|      .0#
-#Total          #     .0%|     .0%|     .0%|     .0%|    1.0%|     .0%|     .0%|    1.0%#
+#Total          #      .0|      .0|      .0|      .0|     1.0|      .0|      .0|     1.0#
 #===============#========#========#========#========#========#========#========#========#
 EOF
 if [ $? -ne 0 ] ; then fail ; fi