X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fexamine-percentiles.sh;h=92e53c8e633770ee3270630f1dd73600f2b524f5;hb=407f3c634628b92fb6b57cbcff229270107cdddc;hp=2275461ad2a9c9dde831ed480d0f214b29575b2a;hpb=1339492699ce7e12c9bf9fa17f9d60a66024cbd1;p=pspp

diff --git a/tests/command/examine-percentiles.sh b/tests/command/examine-percentiles.sh
index 2275461ad2..92e53c8e63 100755
--- a/tests/command/examine-percentiles.sh
+++ b/tests/command/examine-percentiles.sh
@@ -7,16 +7,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$EXEEXT
 
 # 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
 }
 
@@ -75,124 +88,75 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare results"
-diff -b -B $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
-+--------+------+
-|Variable|Format|
-#========#======#
-|X       |F8.0  |
-+--------+------+
-
-2.1 EXAMINE.  Case Processing Summary
-#=#=============================#
-# #            Cases            #
-# #---------+---------+---------#
-# #  Valid  | Missing |  Total  #
-# #-+-------+-+-------+-+-------#
-# #N|Percent|N|Percent|N|Percent#
-#=#=#=======#=#=======#=#=======#
-#X#3|   100%|0|     0%|3|   100%#
-#=#=#=======#=#=======#=#=======#
-
-2.2 EXAMINE.  Percentiles
-#================#================================#
-#                #             Percentiles        #
-#                #---+---+----+----+----+----+----#
-#                # 5 | 10| 25 | 50 | 75 | 90 | 95 #
-#=#==============#===#===#====#====#====#====#====#
-#X|HAverage      #.40|.80|2.00|5.00|8.00|8.00|8.00#
-# |Tukey's Hinges#   |   |3.50|5.00|6.50|    |    #
-#=#==============#===#===#====#====#====#====#====#
-
-3.1 EXAMINE.  Case Processing Summary
-#=#=============================#
-# #            Cases            #
-# #---------+---------+---------#
-# #  Valid  | Missing |  Total  #
-# #-+-------+-+-------+-+-------#
-# #N|Percent|N|Percent|N|Percent#
-#=#=#=======#=#=======#=#=======#
-#X#3|   100%|0|     0%|3|   100%#
-#=#=#=======#=#=======#=#=======#
-
-3.2 EXAMINE.  Percentiles
-#==================#================================#
-#                  #             Percentiles        #
-#                  #---+---+----+----+----+----+----#
-#                  # 5 | 10| 25 | 50 | 75 | 90 | 95 #
-#=#================#===#===#====#====#====#====#====#
-#X|Weighted Average#.30|.60|1.50|3.50|5.75|7.10|7.55#
-# |Tukey's Hinges  #   |   |3.50|5.00|6.50|    |    #
-#=#================#===#===#====#====#====#====#====#
-
-4.1 EXAMINE.  Case Processing Summary
-#=#=============================#
-# #            Cases            #
-# #---------+---------+---------#
-# #  Valid  | Missing |  Total  #
-# #-+-------+-+-------+-+-------#
-# #N|Percent|N|Percent|N|Percent#
-#=#=#=======#=#=======#=#=======#
-#X#3|   100%|0|     0%|3|   100%#
-#=#=#=======#=#=======#=#=======#
-
-4.2 EXAMINE.  Percentiles
-#================#================================#
-#                #             Percentiles        #
-#                #---+---+----+----+----+----+----#
-#                # 5 | 10| 25 | 50 | 75 | 90 | 95 #
-#=#==============#===#===#====#====#====#====#====#
-#X|Rounded       #.00|.00|2.00|5.00|5.00|8.00|8.00#
-# |Tukey's Hinges#   |   |3.50|5.00|6.50|    |    #
-#=#==============#===#===#====#====#====#====#====#
-
-5.1 EXAMINE.  Case Processing Summary
-#=#=============================#
-# #            Cases            #
-# #---------+---------+---------#
-# #  Valid  | Missing |  Total  #
-# #-+-------+-+-------+-+-------#
-# #N|Percent|N|Percent|N|Percent#
-#=#=#=======#=#=======#=#=======#
-#X#3|   100%|0|     0%|3|   100%#
-#=#=#=======#=#=======#=#=======#
-
-5.2 EXAMINE.  Percentiles
-#================#==================================#
-#                #              Percentiles         #
-#                #----+----+----+----+----+----+----#
-#                #  5 | 10 | 25 | 50 | 75 | 90 | 95 #
-#=#==============#====#====#====#====#====#====#====#
-#X|Empirical     #2.00|2.00|2.00|5.00|8.00|8.00|8.00#
-# |Tukey's Hinges#    |    |3.50|5.00|6.50|    |    #
-#=#==============#====#====#====#====#====#====#====#
-
-6.1 EXAMINE.  Case Processing Summary
-#=#=============================#
-# #            Cases            #
-# #---------+---------+---------#
-# #  Valid  | Missing |  Total  #
-# #-+-------+-+-------+-+-------#
-# #N|Percent|N|Percent|N|Percent#
-#=#=#=======#=#=======#=#=======#
-#X#3|   100%|0|     0%|3|   100%#
-#=#=#=======#=#=======#=#=======#
-
-6.2 EXAMINE.  Percentiles
-#==========================#==================================#
-#                          #              Percentiles         #
-#                          #----+----+----+----+----+----+----#
-#                          #  5 | 10 | 25 | 50 | 75 | 90 | 95 #
-#=#========================#====#====#====#====#====#====#====#
-#X|Empirical with averaging#2.00|2.00|2.00|5.00|8.00|8.00|8.00#
-# |Tukey's Hinges          #    |    |3.50|5.00|6.50|    |    #
-#=#========================#====#====#====#====#====#====#====#
-
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+X,F8.0
+
+Table: Case Processing Summary
+,Cases,,,,,
+,Valid,,Missing,,Total,
+,N,Percent,N,Percent,N,Percent
+X,3,100%,0,0%,3,100%
+
+Table: Percentiles
+,,Percentiles,,,,,,
+,,5,10,25,50,75,90,95
+X,HAverage,.40,.80,2.00,5.00,8.00,8.00,8.00
+,Tukey's Hinges,,,3.50,5.00,6.50,,
+
+Table: Case Processing Summary
+,Cases,,,,,
+,Valid,,Missing,,Total,
+,N,Percent,N,Percent,N,Percent
+X,3,100%,0,0%,3,100%
+
+Table: Percentiles
+,,Percentiles,,,,,,
+,,5,10,25,50,75,90,95
+X,Weighted Average,.30,.60,1.50,3.50,5.75,7.10,7.55
+,Tukey's Hinges,,,3.50,5.00,6.50,,
+
+Table: Case Processing Summary
+,Cases,,,,,
+,Valid,,Missing,,Total,
+,N,Percent,N,Percent,N,Percent
+X,3,100%,0,0%,3,100%
+
+Table: Percentiles
+,,Percentiles,,,,,,
+,,5,10,25,50,75,90,95
+X,Rounded,.00,.00,2.00,5.00,5.00,8.00,8.00
+,Tukey's Hinges,,,3.50,5.00,6.50,,
+
+Table: Case Processing Summary
+,Cases,,,,,
+,Valid,,Missing,,Total,
+,N,Percent,N,Percent,N,Percent
+X,3,100%,0,0%,3,100%
+
+Table: Percentiles
+,,Percentiles,,,,,,
+,,5,10,25,50,75,90,95
+X,Empirical,2.00,2.00,2.00,5.00,8.00,8.00,8.00
+,Tukey's Hinges,,,3.50,5.00,6.50,,
+
+Table: Case Processing Summary
+,Cases,,,,,
+,Valid,,Missing,,Total,
+,N,Percent,N,Percent,N,Percent
+X,3,100%,0,0%,3,100%
+
+Table: Percentiles
+,,Percentiles,,,,,,
+,,5,10,25,50,75,90,95
+X,Empirical with averaging,2.00,2.00,2.00,5.00,8.00,8.00,8.00
+,Tukey's Hinges,,,3.50,5.00,6.50,,
 EOF
 if [ $? -ne 0 ] ; then fail ; fi