X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fexamine-extremes.sh;h=fc648313b4db9cd8710579eee5e8436115770cc4;hb=af4066391f20365e210460a736b1b02efe194da6;hp=9c2dfb6051586a807d450b973aac3bfc15e94e81;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp-builds.git

diff --git a/tests/command/examine-extremes.sh b/tests/command/examine-extremes.sh
index 9c2dfb60..fc648313 100755
--- a/tests/command/examine-extremes.sh
+++ b/tests/command/examine-extremes.sh
@@ -9,6 +9,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`
@@ -16,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
 }
@@ -88,7 +95,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
@@ -105,23 +112,23 @@ diff -b  $TEMPDIR/pspp.list - << EOF
 #V1#23|   100%|0|     0%|23|   100%#
 #==#==#=======#=#=======#==#=======#
 1.2 EXAMINE.  Extreme Values
-#==========#===========#=====#
-#          #Case Number|Value#
-#==========#===========#=====#
-#V1Highest1#         21|20.00#
-#         2#         20|19.00#
-#         3#         19|18.00#
-#         4#         19|18.00#
-#         5#         18|17.00#
-#         6#         17|16.00#
-#  --------#-----------+-----#
-#   Lowest1#          1| 1.00#
-#         2#          2| 2.00#
-#         3#          4| 3.00#
-#         4#          3| 3.00#
-#         5#          3| 3.00#
-#         6#          5| 4.00#
-#==========#===========#=====#
+#============#===========#=====#
+#            #Case Number|Value#
+#============#===========#=====#
+#V1 Highest 1#         21|20.00#
+#           2#         20|19.00#
+#           3#         19|18.00#
+#           4#         19|18.00#
+#           5#         18|17.00#
+#           6#         17|16.00#
+#  ----------#-----------+-----#
+#    Lowest 1#          1| 1.00#
+#           2#          2| 2.00#
+#           3#          4| 3.00#
+#           4#          3| 3.00#
+#           5#          3| 3.00#
+#           6#          5| 4.00#
+#============#===========#=====#
 EOF
 if [ $? -ne 0 ] ; then fail ; fi