X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fcrosstabs-crash.sh;h=4454319c709420bb47181ef010698499a87bdb20;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=84bd9d6ded8265e2f393833b62d5b3530d5a89f2;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp-builds.git

diff --git a/tests/bugs/crosstabs-crash.sh b/tests/bugs/crosstabs-crash.sh
index 84bd9d6d..4454319c 100755
--- a/tests/bugs/crosstabs-crash.sh
+++ b/tests/bugs/crosstabs-crash.sh
@@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps
 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
 top_srcdir=`cd $top_srcdir; pwd`
@@ -17,9 +18,15 @@ 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
 }
@@ -63,7 +70,7 @@ CROSSTABS VARIABLES X (1,7) Y (1,7) /TABLES X BY Y.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
-$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
@@ -88,7 +95,7 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF
 #---------------#--------+--------+--------+--------+--------+--------#
 #X * Y          #       1|  100.0%|       0|    0.0%|       1|  100.0%#
 #===============#========#========#========#========#========#========#
-2.2 CROSSTABS.  X by Y [count].
+2.2 CROSSTABS.  X * Y [count].
 #===============#==============================================================#========#
 #               #                               Y                              |        #
 #               #--------+--------+--------+--------+--------+--------+--------+        #
@@ -101,7 +108,7 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF
 #           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