X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fweight.sh;h=8f759b21c27d849d50cf2bd8fe8f26e5f0339450;hb=a1c8f6fe2935432af4dbe30aef2434c6ad437a56;hp=aaa633bcf887299ed3bf8a70a43d6305179f47b7;hpb=c0ed03fd27298cf2b18f0fb373e919ab8b4ae4f4;p=pspp

diff --git a/tests/command/weight.sh b/tests/command/weight.sh
index aaa633bcf8..8f759b21c2 100755
--- a/tests/command/weight.sh
+++ b/tests/command/weight.sh
@@ -3,6 +3,7 @@
 # This program tests the WEIGHT command
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -14,6 +15,7 @@ export STAT_CONFIG_PATH=$top_srcdir/config
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then return ; fi
      rm -rf $TEMPDIR
 }
 
@@ -46,24 +48,24 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/weight.stat <<EOF
-data list file='$here/weighting.data'/AVAR 1-5 BVAR 6-10.
+cat > $TESTFILE << EOF
+data list file='$top_srcdir/tests/weighting.data'/AVAR 1-5 BVAR 6-10.
 weight by BVAR.
 
 descriptives AVAR /statistics all /format serial.
-frequencies AVAR /statistics all /format condensed.
+frequencies AVAR /statistics all /format condense.
 
 EOF
 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 $TESTFILE
 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 "$here/weighting.data".
+1.1 DATA LIST.  Reading 1 record from file $top_srcdir/tests/weighting.data.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
@@ -75,7 +77,7 @@ diff -B -b $TEMPDIR/pspp.list - <<EOF
 +--------#-------+---------+------+--------+-------+--------+--------+--------+--------+--------+------+-------+-------+---------+
 |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|
+|AVAR    #    730|        0|31.515|    .405| 10.937| 119.608|   2.411|    .181|   1.345|    .090|76.000| 18.000| 94.000|23006.000|
 +--------#-------+---------+------+--------+-------+--------+--------+--------+--------+--------+------+-------+-------+---------+
 
 3.1 FREQUENCIES.  AVAR: 
@@ -137,20 +139,24 @@ diff -B -b $TEMPDIR/pspp.list - <<EOF
 |      94|       1|  0|100|
 +--------+--------+---+---+
 
-Mean         31.515
-S.E. Mean      .405
-Median         .   
-Mode         21.000
-Std Dev      10.937
-Variance    119.608
-Kurtosis      2.411
-S.E. Kurt      .181
-Skewness      1.345
-S.E. Skew      .090
-Range        76.000
-Minimum      18.000
-Maximum      94.000
-Sum       23006.000
++-----------------+---------+
+|N         Valid  |      730|
+|          Missing|        0|
+|Mean             |   31.515|
+|S.E. Mean        |     .405|
+|Median           |   28.500|
+|Mode             |   21.000|
+|Std Dev          |   10.937|
+|Variance         |  119.608|
+|Kurtosis         |    2.411|
+|S.E. Kurt        |     .181|
+|Skewness         |    1.345|
+|S.E. Skew        |     .090|
+|Range            |   76.000|
+|Minimum          |   18.000|
+|Maximum          |   94.000|
+|Sum              |23006.000|
++-----------------+---------+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi