FREQUENCIES: Make frequency table headings easier to translate.

[pspp-builds.git] / tests / bugs / temp-freq.sh

diff --git a/tests/bugs/temp-freq.sh b/tests/bugs/temp-freq.sh
index 7ec3c012a49f21dd32f58730b5100f73816f9b3a..6168f4bb86fa6149a72062c363e848ff8485798b 100755 (executable)
--- a/tests/bugs/temp-freq.sh
+++ b/tests/bugs/temp-freq.sh
@@ -24,6 +24,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -79,7 +83,7 @@ FINISH
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
-$SUPERVISOR $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
@@ -91,26 +95,25 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF
 |SEX     |A1    |
 |X       |F8.0  |
 +--------+------+
-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|
-#===========#========#=========#========#========#========#
-|               Total|        4|   100.0|   100.0|        |
-+--------------------+---------+--------+--------+--------+
-+---------------+------+
-|N       Valid  |     4|
-|        Missing|     0|
-|Mean           |19.250|
-|Std Dev        | 8.808|
-|Minimum        |12.000|
-|Maximum        |31.000|
-+---------------+------+
+2.1 FREQUENCIES.  X
++-----------+--------+---------+--------+-------------+-----------+
+|Value Label|  Value |Frequency| Percent|Valid Percent|Cum Percent|
+#===========#========#=========#========#=============#===========#
+|           |   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.25|
+|Std Dev        | 8.81|
+|Minimum        |12.00|
+|Maximum        |31.00|
++---------------+-----+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi