Made all the tests respect the PSPP_TEST_NO_CLEANUP environment variable.

[pspp-builds.git] / tests / stats / percentiles-enhanced.sh

diff --git a/tests/stats/percentiles-enhanced.sh b/tests/stats/percentiles-enhanced.sh
index f258e763ea69ce2942fad589c3a29ac4552084dc..f818f820b48e35b6f1d04cbe6b03a5dc13817688 100755 (executable)
--- a/tests/stats/percentiles-enhanced.sh
+++ b/tests/stats/percentiles-enhanced.sh
@@ -23,9 +23,12 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
-     :
 }
 
 
@@ -78,13 +81,13 @@ EOF
 if [ $? -ne 0 ] ; then no_result; fi
 
 activity="run program $i"
-$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff  -b $TEMPDIR/pspp.list - <<EOF
-1.1 FREQUENCIES.  X: 
+1.1 FREQUENCIES.  X 
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |
 |Value Label|  Value |Frequency| Percent| Percent| Percent|
@@ -97,19 +100,19 @@ diff  -b $TEMPDIR/pspp.list - <<EOF
 #===========#========#=========#========#========#========#
 |               Total|        5|   100.0|   100.0|        |
 +--------------------+---------+--------+--------+--------+
-+-------------------+-----+
-|N           Valid  |    5|
-|            Missing|    0|
-|Mean               |3.000|
-|Std Dev            |1.581|
-|Minimum            |1.000|
-|Maximum            |5.000|
-|Percentiles 0      |1.000|
-|            25     |2.000|
-|            50     |3.000|
-|            75     |4.000|
-|            100    |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N           Valid      |    5|
+|            Missing    |    0|
+|Mean                   |3.000|
+|Std Dev                |1.581|
+|Minimum                |1.000|
+|Maximum                |5.000|
+|Percentiles 0          |1.000|
+|            25         |2.000|
+|            50 (Median)|3.000|
+|            75         |4.000|
+|            100        |5.000|
++-----------------------+-----+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -141,13 +144,13 @@ if [ $? -ne 0 ] ; then no_result; fi
 
 
 activity="run program $i"
-$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff  -b $TEMPDIR/pspp.list - <<EOF
-1.1 FREQUENCIES.  X: 
+1.1 FREQUENCIES.  X 
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |
 |Value Label|  Value |Frequency| Percent| Percent| Percent|
@@ -160,19 +163,19 @@ diff  -b $TEMPDIR/pspp.list - <<EOF
 #===========#========#=========#========#========#========#
 |               Total|       10|   100.0|   100.0|        |
 +--------------------+---------+--------+--------+--------+
-+-------------------+-----+
-|N           Valid  |   10|
-|            Missing|    0|
-|Mean               |3.000|
-|Std Dev            |1.491|
-|Minimum            |1.000|
-|Maximum            |5.000|
-|Percentiles 0      |1.000|
-|            25     |2.000|
-|            50     |3.000|
-|            75     |4.000|
-|            100    |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N           Valid      |   10|
+|            Missing    |    0|
+|Mean                   |3.000|
+|Std Dev                |1.491|
+|Minimum                |1.000|
+|Maximum                |5.000|
+|Percentiles 0          |1.000|
+|            25         |2.000|
+|            50 (Median)|3.000|
+|            75         |4.000|
+|            100        |5.000|
++-----------------------+-----+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -202,13 +205,13 @@ if [ $? -ne 0 ] ; then no_result; fi
 
 
 activity="run program $i"
-$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff  -b $TEMPDIR/pspp.list - <<EOF
-1.1 FREQUENCIES.  X: 
+1.1 FREQUENCIES.  X 
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |
 |Value Label|  Value |Frequency| Percent| Percent| Percent|
@@ -220,19 +223,19 @@ diff  -b $TEMPDIR/pspp.list - <<EOF
 #===========#========#=========#========#========#========#
 |               Total|        6|   100.0|   100.0|        |
 +--------------------+---------+--------+--------+--------+
-+-------------------+-----+
-|N           Valid  |    6|
-|            Missing|    0|
-|Mean               |3.500|
-|Std Dev            |1.517|
-|Minimum            |1.000|
-|Maximum            |5.000|
-|Percentiles 0      |1.000|
-|            25     |3.000|
-|            50     |3.500|
-|            75     |4.750|
-|            100    |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N           Valid      |    6|
+|            Missing    |    0|
+|Mean                   |3.500|
+|Std Dev                |1.517|
+|Minimum                |1.000|
+|Maximum                |5.000|
+|Percentiles 0          |1.000|
+|            25         |3.000|
+|            50 (Median)|3.500|
+|            75         |4.750|
+|            100        |5.000|
++-----------------------+-----+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -262,13 +265,13 @@ if [ $? -ne 0 ] ; then no_result; fi
 
 
 activity="run program $i"
-$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff -b $TEMPDIR/pspp.list - <<EOF
-1.1 FREQUENCIES.  X: 
+1.1 FREQUENCIES.  X 
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |
 |Value Label|  Value |Frequency| Percent| Percent| Percent|
@@ -281,19 +284,19 @@ diff -b $TEMPDIR/pspp.list - <<EOF
 #===========#========#=========#========#========#========#
 |               Total|       10|   100.0|   100.0|        |
 +--------------------+---------+--------+--------+--------+
-+-------------------+-----+
-|N           Valid  |    6|
-|            Missing|    4|
-|Mean               |3.500|
-|Std Dev            |1.517|
-|Minimum            |1.000|
-|Maximum            |5.000|
-|Percentiles 0      |1.000|
-|            25     |3.000|
-|            50     |3.500|
-|            75     |4.750|
-|            100    |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N           Valid      |    6|
+|            Missing    |    4|
+|Mean                   |3.500|
+|Std Dev                |1.517|
+|Minimum                |1.000|
+|Maximum                |5.000|
+|Percentiles 0          |1.000|
+|            25         |3.000|
+|            50 (Median)|3.500|
+|            75         |4.750|
+|            100        |5.000|
++-----------------------+-----+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi