X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=tests%2Fcommand%2Fexamine.sh;h=8fc9f7ca8f3791a20416d1ef354fcdfc3241b53a;hb=02b539a8876795a0fb9cb747e297eb825a2b2747;hp=178df9dfc354080f0cbcc17b660536bd220153f1;hpb=692311e8b42e47c4886896c6e2d2fbf846151652;p=pspp-builds.git

diff --git a/tests/command/examine.sh b/tests/command/examine.sh
index 178df9df..8fc9f7ca 100755
--- a/tests/command/examine.sh
+++ b/tests/command/examine.sh
@@ -5,16 +5,28 @@
 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
 }
 
@@ -48,7 +60,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TESTFILE <<EOF
-DATA LIST LIST /quality * w * brand * .
+DATA LIST LIST /QUALITY * W * BRAND * .
 BEGIN DATA
 3  1  1
 2  2  1
@@ -86,173 +98,139 @@ 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
 
 # NOTE:  In the following data: Only the extreme values have been checked
 # The descriptives have been blindly pasted.
 activity="compare results"
-diff -b -B $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
-+--------+------+
-|Variable|Format|
-#========#======#
-|QUALITY |F8.0  |
-|W       |F8.0  |
-|BRAND   |F8.0  |
-+--------+------+
-
-Case#  QUALITY        W    BRAND
------ -------- -------- --------
-    1     3.00     1.00     1.00 
-    2     2.00     2.00     1.00 
-    3     1.00     2.00     1.00 
-    4     1.00     1.00     1.00 
-    5     4.00     1.00     1.00 
-    6     4.00     1.00     1.00 
-    7     5.00     1.00     2.00 
-    8     2.00     1.00     2.00 
-    9     4.00     4.00     2.00 
-   10     2.00     1.00     2.00 
-   11     3.00     1.00     2.00 
-   12     7.00     1.00     3.00 
-   13     4.00     2.00     3.00 
-   14     5.00     3.00     3.00 
-   15     3.00     1.00     3.00 
-   16     6.00     1.00     3.00 
-
-2.1 EXAMINE.  Case Processing Summary
-#===============#===============================#
-#               #             Cases             #
-#               #----------+---------+----------#
-#               #   Valid  | Missing |   Total  #
-#               #--+-------+-+-------+--+-------#
-#               # N|Percent|N|Percent| N|Percent#
-#===============#==#=======#=#=======#==#=======#
-#Breaking Strain#24|   100%|0|     0%|24|   100%#
-#===============#==#=======#=#=======#==#=======#
-
-2.2 EXAMINE.  Extreme Values
-#=======================#===========#=====#
-#                       #Case Number|Value#
-#=======================#===========#=====#
-#Breaking StrainHighest1#         12| 7.00#
-#                      2#         16| 6.00#
-#                      3#         14| 5.00#
-#               --------#-----------+-----#
-#                Lowest1#          4| 1.00#
-#                      2#          3| 1.00#
-#                      3#          3| 1.00#
-#=======================#===========#=====#
-
-2.3 EXAMINE.  Descriptives
-#==========================================================#=========#==========#
-#                                                          #Statistic|Std. Error#
-#==========================================================#=========#==========#
-#Breaking StrainMean                                       #   3.54  |   .324   #
-#               95% Confidence Interval for MeanLower Bound#  3.562  |          #
-#                                               Upper Bound#  3.521  |          #
-#               5% Trimmed Mean                            #   3.50  |          #
-#               Median                                     #   4.00  |          #
-#               Variance                                   #  2.520  |          #
-#               Std. Deviation                             #  1.587  |          #
-#               Minimum                                    #  1.000  |          #
-#               Maximum                                    #  7.000  |          #
-#               Range                                      #  6.000  |          #
-#               Interquartile Range                        #   2.75  |          #
-#               Skewness                                   #   .059  |   .472   #
-#               Kurtosis                                   #  -.358  |   .918   #
-#==========================================================#=========#==========#
-
-2.4 EXAMINE.  Case Processing Summary
-#===========================#=============================#
-#                           #            Cases            #
-#                           #---------+---------+---------#
-#                           #  Valid  | Missing |  Total  #
-#                           #-+-------+-+-------+-+-------#
-#               Manufacturer#N|Percent|N|Percent|N|Percent#
-#===========================#=#=======#=#=======#=#=======#
-#Breaking StrainAspeger     #8|   100%|0|     0%|8|   100%#
-#               Bloggs      #8|   100%|0|     0%|8|   100%#
-#               Charlies    #8|   100%|0|     0%|8|   100%#
-#===========================#=#=======#=#=======#=#=======#
-
-2.5 EXAMINE.  Extreme Values
-#===================================#===========#=====#
-#               Manufacturer        #Case Number|Value#
-#===================================#===========#=====#
-#Breaking StrainAspeger     Highest1#          6| 4.00#
-#                                  2#          5| 4.00#
-#                                  3#          1| 3.00#
-#                           --------#-----------+-----#
-#                            Lowest1#          4| 1.00#
-#                                  2#          3| 1.00#
-#                                  3#          3| 1.00#
-#               --------------------#-----------+-----#
-#               Bloggs      Highest1#          7| 5.00#
-#                                  2#          9| 4.00#
-#                                  3#          9| 4.00#
-#                           --------#-----------+-----#
-#                            Lowest1#         10| 2.00#
-#                                  2#          8| 2.00#
-#                                  3#         11| 3.00#
-#               --------------------#-----------+-----#
-#               Charlies    Highest1#         12| 7.00#
-#                                  2#         16| 6.00#
-#                                  3#         14| 5.00#
-#                           --------#-----------+-----#
-#                            Lowest1#         15| 3.00#
-#                                  2#         13| 4.00#
-#                                  3#         13| 4.00#
-#===================================#===========#=====#
-
-2.6 EXAMINE.  Descriptives
-#======================================================================#=========#==========#
-#               Manufacturer                                           #Statistic|Std. Error#
-#======================================================================#=========#==========#
-#Breaking StrainAspeger     Mean                                       #   2.25  |   .453   #
-#                           95% Confidence Interval for MeanLower Bound#  2.279  |          #
-#                                                           Upper Bound#  2.221  |          #
-#                           5% Trimmed Mean                            #   2.22  |          #
-#                           Median                                     #   2.00  |          #
-#                           Variance                                   #  1.643  |          #
-#                           Std. Deviation                             #  1.282  |          #
-#                           Minimum                                    #  1.000  |          #
-#                           Maximum                                    #  4.000  |          #
-#                           Range                                      #  3.000  |          #
-#                           Interquartile Range                        #   2.75  |          #
-#                           Skewness                                   #   .475  |   .752   #
-#                           Kurtosis                                   #  -1.546 |   1.481  #
-#               -------------------------------------------------------#---------+----------#
-#               Bloggs      Mean                                       #   3.50  |   .378   #
-#                           95% Confidence Interval for MeanLower Bound#  3.525  |          #
-#                                                           Upper Bound#  3.475  |          #
-#                           5% Trimmed Mean                            #   3.50  |          #
-#                           Median                                     #   4.00  |          #
-#                           Variance                                   #  1.143  |          #
-#                           Std. Deviation                             #  1.069  |          #
-#                           Minimum                                    #  2.000  |          #
-#                           Maximum                                    #  5.000  |          #
-#                           Range                                      #  3.000  |          #
-#                           Interquartile Range                        #   1.75  |          #
-#                           Skewness                                   #  -.468  |   .752   #
-#                           Kurtosis                                   #  -.831  |   1.481  #
-#               -------------------------------------------------------#---------+----------#
-#               Charlies    Mean                                       #   4.88  |   .441   #
-#                           95% Confidence Interval for MeanLower Bound#  4.904  |          #
-#                                                           Upper Bound#  4.846  |          #
-#                           5% Trimmed Mean                            #   4.86  |          #
-#                           Median                                     #   5.00  |          #
-#                           Variance                                   #  1.554  |          #
-#                           Std. Deviation                             #  1.246  |          #
-#                           Minimum                                    #  3.000  |          #
-#                           Maximum                                    #  7.000  |          #
-#                           Range                                      #  4.000  |          #
-#                           Interquartile Range                        #   1.75  |          #
-#                           Skewness                                   #   .304  |   .752   #
-#                           Kurtosis                                   #   .146  |   1.481  #
-#======================================================================#=========#==========#
-
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+QUALITY,F8.0
+W,F8.0
+BRAND,F8.0
+
+Table: Data List
+Case Number,QUALITY,W,BRAND
+1,3.00,1.00,1.00
+2,2.00,2.00,1.00
+3,1.00,2.00,1.00
+4,1.00,1.00,1.00
+5,4.00,1.00,1.00
+6,4.00,1.00,1.00
+7,5.00,1.00,2.00
+8,2.00,1.00,2.00
+9,4.00,4.00,2.00
+10,2.00,1.00,2.00
+11,3.00,1.00,2.00
+12,7.00,1.00,3.00
+13,4.00,2.00,3.00
+14,5.00,3.00,3.00
+15,3.00,1.00,3.00
+16,6.00,1.00,3.00
+
+Table: Case Processing Summary
+,Cases,,,,,
+,Valid,,Missing,,Total,
+,N,Percent,N,Percent,N,Percent
+Breaking Strain,24.00,100%,.00,0%,24.00,100%
+
+Table: Extreme Values
+,,,Case Number,Value
+Breaking Strain,Highest,1,12,7.00
+,,2,16,6.00
+,,3,7,5.00
+,Lowest,1,3,1.00
+,,2,3,1.00
+,,3,4,1.00
+
+Table: Descriptives
+,,,Statistic,Std. Error
+Breaking Strain,Mean,,3.54,.32
+,95% Confidence Interval for Mean,Lower Bound,2.87,
+,,Upper Bound,4.21,
+,5% Trimmed Mean,,3.50,
+,Median,,4.00,
+,Variance,,2.52,
+,Std. Deviation,,1.59,
+,Minimum,,1.00,
+,Maximum,,7.00,
+,Range,,6.00,
+,Interquartile Range,,2.75,
+,Skewness,,.06,.47
+,Kurtosis,,-.36,.92
+
+Table: Case Processing Summary
+,,Cases,,,,,
+,,Valid,,Missing,,Total,
+,Manufacturer,N,Percent,N,Percent,N,Percent
+Breaking Strain,Aspeger,8.00,100%,.00,0%,8.00,100%
+,Bloggs,8.00,100%,.00,0%,8.00,100%
+,Charlies,8.00,100%,.00,0%,8.00,100%
+
+Table: Extreme Values
+,Manufacturer,,,Case Number,Value
+Breaking Strain,Aspeger,Highest,1,5,4.00
+,,,2,6,4.00
+,,,3,1,3.00
+,,Lowest,1,3,1.00
+,,,2,3,1.00
+,,,3,4,1.00
+,Bloggs,Highest,1,7,5.00
+,,,2,9,4.00
+,,,3,9,4.00
+,,Lowest,1,8,2.00
+,,,2,10,2.00
+,,,3,11,3.00
+,Charlies,Highest,1,12,7.00
+,,,2,16,6.00
+,,,3,14,5.00
+,,Lowest,1,15,3.00
+,,,2,13,4.00
+,,,3,13,4.00
+
+Table: Descriptives
+,Manufacturer,,,Statistic,Std. Error
+Breaking Strain,Aspeger,Mean,,2.25,.45
+,,95% Confidence Interval for Mean,Lower Bound,1.18,
+,,,Upper Bound,3.32,
+,,5% Trimmed Mean,,2.22,
+,,Median,,2.00,
+,,Variance,,1.64,
+,,Std. Deviation,,1.28,
+,,Minimum,,1.00,
+,,Maximum,,4.00,
+,,Range,,3.00,
+,,Interquartile Range,,2.75,
+,,Skewness,,.47,.75
+,,Kurtosis,,-1.55,1.48
+,Bloggs,Mean,,3.50,.38
+,,95% Confidence Interval for Mean,Lower Bound,2.61,
+,,,Upper Bound,4.39,
+,,5% Trimmed Mean,,3.50,
+,,Median,,4.00,
+,,Variance,,1.14,
+,,Std. Deviation,,1.07,
+,,Minimum,,2.00,
+,,Maximum,,5.00,
+,,Range,,3.00,
+,,Interquartile Range,,1.75,
+,,Skewness,,-.47,.75
+,,Kurtosis,,-.83,1.48
+,Charlies,Mean,,4.88,.44
+,,95% Confidence Interval for Mean,Lower Bound,3.83,
+,,,Upper Bound,5.92,
+,,5% Trimmed Mean,,4.86,
+,,Median,,5.00,
+,,Variance,,1.55,
+,,Std. Deviation,,1.25,
+,,Minimum,,3.00,
+,,Maximum,,7.00,
+,,Range,,4.00,
+,,Interquartile Range,,1.75,
+,,Skewness,,.30,.75
+,,Kurtosis,,.15,1.48
 EOF
 if [ $? -ne 0 ] ; then fail ; fi