X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fweight.sh;h=826a9a1cc089fb70d75185b45c1be2646fc08f10;hb=8438b8372d8c988b379fada8a882a84bbb894126;hp=35bbaa7782ba26bb16a38ee05a661d6bce1cd424;hpb=5bae7045326ba7e3294c29b2bfe56acd4b4b26ec;p=pspp

diff --git a/tests/command/weight.sh b/tests/command/weight.sh
index 35bbaa7782..826a9a1cc0 100755
--- a/tests/command/weight.sh
+++ b/tests/command/weight.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# This program tests ....
+# This program tests the WEIGHT command
 
 TEMPDIR=/tmp/pspp-tst-$$
 
@@ -47,7 +47,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TEMPDIR/weight.stat <<EOF
-data list file='$here/weighting.data'/AVAR 1-5 BVAR 6-10.
+data list file='$top_srcdir/tests/weighting.data'/AVAR 1-5 BVAR 6-10.
 weight by BVAR.
 
 descriptives AVAR /statistics all /format serial.
@@ -58,13 +58,12 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/weight.stat
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/weight.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
-
 activity="compare results"
 diff -B -b $TEMPDIR/pspp.list - <<EOF
-1.1 DATA LIST.  Reading 1 record from file "/tmp/pspp/tests/weighting.data".
+1.1 DATA LIST.  Reading 1 record from file "$top_srcdir/tests/weighting.data".
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
@@ -72,19 +71,12 @@ diff -B -b $TEMPDIR/pspp.list - <<EOF
 |BVAR    |     1|  6- 10|F5.0  |
 +--------+------+-------+------+
 
-2.1(1) DESCRIPTIVES.  Valid cases = 730; cases with missing value(s) = 0.
-+--------#-------+---------+------+--------+-------+--------+--------+--------+
-|Variable#Valid N|Missing N| Mean |S E Mean|Std Dev|Variance|Kurtosis|S E Kurt|
-#========#=======#=========#======#========#=======#========#========#========#
-|AVAR    #    730|        0|31.515|    .405| 10.937| 119.608|2548.162|    .181|
-+--------#-------+---------+------+--------+-------+--------+--------+--------+
-
-2.1(2) DESCRIPTIVES.  Valid cases = 730; cases with missing value(s) = 0.
-+--------#--------+--------+------+-------+-------+---------+
-|Variable#Skewness|S E Skew| Range|Minimum|Maximum|   Sum   |
-#========#========#========#======#=======#=======#=========#
-|AVAR    #   1.345|    .090|76.000| 18.000| 94.000|23006.000|
-+--------#--------+--------+------+-------+-------+---------+
+2.1 DESCRIPTIVES.  Valid cases = 730; cases with missing value(s) = 0.
++--------#-------+---------+------+--------+-------+--------+--------+--------+--------+--------+------+-------+-------+---------+
+|Variable#Valid N|Missing N| Mean |S E Mean|Std Dev|Variance|Kurtosis|S E Kurt|Skewness|S E Skew| Range|Minimum|Maximum|   Sum   |
+#========#=======#=========#======#========#=======#========#========#========#========#========#======#=======#=======#=========#
+|AVAR    #    730|        0|31.515|    .405| 10.937| 119.608|2548.162|    .181|   1.345|    .090|76.000| 18.000| 94.000|23006.000|
++--------#-------+---------+------+--------+-------+--------+--------+--------+--------+--------+------+-------+-------+---------+
 
 3.1 FREQUENCIES.  AVAR: 
 +--------+--------+---+---+
@@ -147,8 +139,8 @@ diff -B -b $TEMPDIR/pspp.list - <<EOF
 
 Mean         31.515
 S.E. Mean      .405
-Median         .000
-Mode           .000
+Median         .   
+Mode         21.000
 Std Dev      10.937
 Variance    119.608
 Kurtosis      2.411
@@ -159,7 +151,6 @@ Range        76.000
 Minimum      18.000
 Maximum      94.000
 Sum       23006.000
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi