X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ftrimmed-mean.sh;h=660752dd914eda2d4146a9aea42ebc7695597515;hb=a36d34531d79e34d314f5346c63153c788acdd1b;hp=80097a121f547fcc10d0147fdb1448929d12991f;hpb=d043fde2b737897e3372670afc47eb648c17624b;p=pspp-builds.git

diff --git a/tests/command/trimmed-mean.sh b/tests/command/trimmed-mean.sh
index 80097a12..660752dd 100755
--- a/tests/command/trimmed-mean.sh
+++ b/tests/command/trimmed-mean.sh
@@ -6,16 +6,29 @@
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
 
-here=`pwd`;
+# ensure that top_builddir  are absolute
+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
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $top_srcdir; pwd`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+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
 }
 
@@ -50,7 +63,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TESTFILE <<EOF
-DATA LIST LIST /x * c *.
+DATA LIST LIST /X * C *.
 BEGIN DATA.
 1 1
 2 49
@@ -68,50 +81,48 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare results"
-diff $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +--------+------+
 |Variable|Format|
 #========#======#
 |X       |F8.0  |
 |C       |F8.0  |
 +--------+------+
-
 2.1 EXAMINE.  Case Processing Summary
-#=#===============================#
-# #             Cases             #
-# #----------+---------+----------#
-# #   Valid  | Missing |   Total  #
-# #--+-------+-+-------+--+-------#
-# # N|Percent|N|Percent| N|Percent#
-#=#==#=======#=#=======#==#=======#
-#X#52|   100%|0|     0%|52|   100%#
-#=#==#=======#=#=======#==#=======#
-
+#=#=======================================#
+# #                 Cases                 #
+# #-------------+-----------+-------------#
+# #    Valid    |  Missing  |    Total    #
+# #-----+-------+---+-------+-----+-------#
+# #  N  |Percent| N |Percent|  N  |Percent#
+#=#=====#=======#===#=======#=====#=======#
+#X#52.00|   100%|.00|     0%|52.00|   100%#
+#=#=====#=======#===#=======#=====#=======#
 2.2 EXAMINE.  Descriptives
-#============================================#=========#==========#
-#                                            #Statistic|Std. Error#
-#============================================#=========#==========#
-#XMean                                       #   2.02  |   .034   #
-# 95% Confidence Interval for MeanLower Bound#  2.021  |          #
-#                                 Upper Bound#  2.017  |          #
-# 5% Trimmed Mean                            #   2.00  |          #
-# Median                                     #   2.00  |          #
-# Variance                                   #   .058  |          #
-# Std. Deviation                             #   .242  |          #
-# Minimum                                    #  1.000  |          #
-# Maximum                                    #  3.000  |          #
-# Range                                      #  2.000  |          #
-# Interquartile Range                        #   .00   |          #
-# Skewness                                   #  1.194  |   .330   #
-# Kurtosis                                   #  15.732 |   .650   #
-#============================================#=========#==========#
-
+#==============================================#=========#==========#
+#                                              #Statistic|Std. Error#
+#==============================================#=========#==========#
+#X Mean                                        #   2.02  |    .03   #
+#  95% Confidence Interval for Mean Lower Bound#   1.95  |          #
+#                                   Upper Bound#   2.09  |          #
+#  5% Trimmed Mean                             #   2.00  |          #
+#  Median                                      #   2.00  |          #
+#  Variance                                    #   .06   |          #
+#  Std. Deviation                              #   .24   |          #
+#  Minimum                                     #   1.00  |          #
+#  Maximum                                     #   3.00  |          #
+#  Range                                       #   2.00  |          #
+#  Interquartile Range                         #   .00   |          #
+#  Skewness                                    #   1.19  |    .33   #
+#  Kurtosis                                    #  15.73  |    .65   #
+#==============================================#=========#==========#
 EOF
 if [ $? -ne 0 ] ; then fail ; fi