Made all the tests respect the PSPP_TEST_NO_CLEANUP environment variable.

[pspp-builds.git] / tests / command / weight.sh

diff --git a/tests/command/weight.sh b/tests/command/weight.sh
index 6446c3448779c764682516268689067672614d1a..6d90315652246bb061504b15db42a7d68880ec29 100755 (executable)
--- a/tests/command/weight.sh
+++ b/tests/command/weight.sh
@@ -3,17 +3,31 @@
 # This program tests the WEIGHT command
 
 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
 }
 
@@ -46,47 +60,38 @@ 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 $PSPP --testing-mode $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 "/tmp/pspp/tests/weighting.data".
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
+1.1 DATA LIST.  Reading 1 record from "$top_srcdir/tests/weighting.data".
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
 |AVAR    |     1|  1-  5|F5.0  |
 |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|
-+--------#--------+--------+------+-------+-------+---------+
-
-3.1 FREQUENCIES.  AVAR: 
+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|   2.411|    .181|   1.345|    .090|76.000| 18.000| 94.000|23006.000|
++--------#-------+---------+------+--------+-------+--------+--------+--------+--------+--------+------+-------+-------+---------+
+3.1 FREQUENCIES.  AVAR 
 +--------+--------+---+---+
 |        |        |   |Cum|
 |  Value |  Freq  |Pct|Pct|
@@ -144,22 +149,24 @@ diff -B -b $TEMPDIR/pspp.list - <<EOF
 |      80|       1|  0|100|
 |      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|
+|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|
+|Percentiles 50 (Median)|   28.500|
++-----------------------+---------+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi