Merge commit 'origin/stable'

[pspp-builds.git] / tests / command / examine-extremes.sh

diff --git a/tests/command/examine-extremes.sh b/tests/command/examine-extremes.sh
index 5a428aae7b94e2c4735e2fbab376e46f6ae9b8fd..67dfed0a5757fa0d859d743e6a407ef26a3a10eb 100755 (executable)
--- a/tests/command/examine-extremes.sh
+++ b/tests/command/examine-extremes.sh
@@ -17,9 +17,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
 }
@@ -89,22 +95,22 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $PSPP -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff -b  $TEMPDIR/pspp.list - << EOF
 1.1 EXAMINE.  Case Processing Summary
-#==#===============================#
-#  #             Cases             #
-#  #----------+---------+----------#
-#  #   Valid  | Missing |   Total  #
-#  #--+-------+-+-------+--+-------#
-#  # N|Percent|N|Percent| N|Percent#
-#==#==#=======#=#=======#==#=======#
-#V1#23|   100%|0|     0%|23|   100%#
-#==#==#=======#=#=======#==#=======#
+#==#=======================================#
+#  #                 Cases                 #
+#  #-------------+-----------+-------------#
+#  #    Valid    |  Missing  |    Total    #
+#  #-----+-------+---+-------+-----+-------#
+#  #  N  |Percent| N |Percent|  N  |Percent#
+#==#=====#=======#===#=======#=====#=======#
+#V1#23.00|   100%|.00|     0%|23.00|   100%#
+#==#=====#=======#===#=======#=====#=======#
 1.2 EXAMINE.  Extreme Values
 #============#===========#=====#
 #            #Case Number|Value#
@@ -118,9 +124,9 @@ diff -b  $TEMPDIR/pspp.list - << EOF
 #  ----------#-----------+-----#
 #    Lowest 1#          1| 1.00#
 #           2#          2| 2.00#
-#           3#          4| 3.00#
+#           3#          3| 3.00#
 #           4#          3| 3.00#
-#           5#          3| 3.00#
+#           5#          4| 3.00#
 #           6#          5| 4.00#
 #============#===========#=====#
 EOF