X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Ftemp-freq.sh;h=4f96916f76d0a6bd304d66e742af7c932872cbe9;hb=ee46f6404b033f4d1312c6b52a207ec2da99d94b;hp=40b1c09d9820859245916ed06767a70c2e64cdbb;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp-builds.git

diff --git a/tests/bugs/temp-freq.sh b/tests/bugs/temp-freq.sh
index 40b1c09d..4f96916f 100755
--- a/tests/bugs/temp-freq.sh
+++ b/tests/bugs/temp-freq.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,16 @@ 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
 }
@@ -75,7 +83,7 @@ FINISH
 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
 
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
@@ -87,26 +95,26 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF
 |SEX     |A1    |
 |X       |F8.0  |
 +--------+------+
-2.1 FREQUENCIES.  X: 
+2.1 FREQUENCIES.  X
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |
 |Value Label|  Value |Frequency| Percent| Percent| Percent|
 #===========#========#=========#========#========#========#
-|           |   12.00|        1|    25.0|    25.0|    25.0|
-|           |   13.00|        1|    25.0|    25.0|    50.0|
-|           |   21.00|        1|    25.0|    25.0|    75.0|
-|           |   31.00|        1|    25.0|    25.0|   100.0|
+|           |   12.00|        1|   25.00|   25.00|   25.00|
+|           |   13.00|        1|   25.00|   25.00|   50.00|
+|           |   21.00|        1|   25.00|   25.00|   75.00|
+|           |   31.00|        1|   25.00|   25.00|  100.00|
 #===========#========#=========#========#========#========#
 |               Total|        4|   100.0|   100.0|        |
 +--------------------+---------+--------+--------+--------+
-+---------------+------+
-|N       Valid  |     4|
-|        Missing|     0|
-|Mean           |19.250|
-|Std Dev        | 8.808|
-|Minimum        |12.000|
-|Maximum        |31.000|
-+---------------+------+
++---------------+-----+
+|N       Valid  |    4|
+|        Missing|    0|
+|Mean           |19.25|
+|Std Dev        | 8.81|
+|Minimum        |12.00|
+|Maximum        |31.00|
++---------------+-----+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi