X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fweight.sh;h=0d4fb3970b21fc685f0c059d72651ff177a75b46;hb=bd17d2af982332ee1791998361b1ac6731fe14fa;hp=44995fc1b68404587605ab9c3265d4add48c34b8;hpb=7e8eec6839205801adddbd6fafb2ceaf7c601d08;p=pspp-builds.git

diff --git a/tests/command/weight.sh b/tests/command/weight.sh
index 44995fc1..0d4fb397 100755
--- a/tests/command/weight.sh
+++ b/tests/command/weight.sh
@@ -5,18 +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`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
 
+LANG=C
+export LANG
+
 
 cleanup()
 {
-     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then return ; fi
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR"
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -51,6 +61,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TESTFILE << EOF
+SET FORMAT F8.3.
 data list file='$top_srcdir/tests/weighting.data'/AVAR 1-5 BVAR 6-10.
 weight by BVAR.
 
@@ -62,104 +73,101 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
-1.1 DATA LIST.  Reading 1 record from file $top_srcdir/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 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: 
++--------#-------+---------+------+---------+-------+--------+--------+---------+--------+---------+------+-------+-------+--------+
+|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.00|
++--------#-------+---------+------+---------+-------+--------+--------+---------+--------+---------+------+-------+-------+--------+
+3.1 FREQUENCIES.  AVAR
 +--------+--------+---+---+
 |        |        |   |Cum|
 |  Value |  Freq  |Pct|Pct|
 #========#========#===#===#
-|      18|       1|  0|  0|
-|      19|       7|  1|  1|
-|      20|      26|  4|  5|
-|      21|      76| 10| 15|
-|      22|      57|  8| 23|
-|      23|      58|  8| 31|
-|      24|      38|  5| 36|
-|      25|      38|  5| 41|
-|      26|      30|  4| 45|
-|      27|      21|  3| 48|
-|      28|      23|  3| 51|
-|      29|      24|  3| 55|
-|      30|      23|  3| 58|
-|      31|      14|  2| 60|
-|      32|      21|  3| 63|
-|      33|      21|  3| 65|
-|      34|      14|  2| 67|
-|      35|      14|  2| 69|
-|      36|      17|  2| 72|
-|      37|      11|  2| 73|
-|      38|      16|  2| 75|
-|      39|      14|  2| 77|
-|      40|      15|  2| 79|
-|      41|      14|  2| 81|
-|      42|      14|  2| 83|
-|      43|       8|  1| 84|
-|      44|      15|  2| 86|
-|      45|      10|  1| 88|
-|      46|      12|  2| 89|
-|      47|      13|  2| 91|
-|      48|      13|  2| 93|
-|      49|       5|  1| 94|
-|      50|       5|  1| 94|
-|      51|       3|  0| 95|
-|      52|       7|  1| 96|
-|      53|       6|  1| 96|
-|      54|       2|  0| 97|
-|      55|       2|  0| 97|
-|      56|       2|  0| 97|
-|      57|       3|  0| 98|
-|      58|       1|  0| 98|
-|      59|       3|  0| 98|
-|      61|       1|  0| 98|
-|      62|       3|  0| 99|
-|      63|       1|  0| 99|
-|      64|       1|  0| 99|
-|      65|       2|  0| 99|
-|      70|       1|  0| 99|
-|      78|       1|  0|100|
-|      79|       1|  0|100|
-|      80|       1|  0|100|
-|      94|       1|  0|100|
+|      18|       1|.13|.13|
+|      19|       7|.95|1.0|
+|      20|      26|3.5|4.6|
+|      21|      76|10.|15.|
+|      22|      57|7.8|22.|
+|      23|      58|7.9|30.|
+|      24|      38|5.2|36.|
+|      25|      38|5.2|41.|
+|      26|      30|4.1|45.|
+|      27|      21|2.8|48.|
+|      28|      23|3.1|51.|
+|      29|      24|3.2|54.|
+|      30|      23|3.1|57.|
+|      31|      14|1.9|59.|
+|      32|      21|2.8|62.|
+|      33|      21|2.8|65.|
+|      34|      14|1.9|67.|
+|      35|      14|1.9|69.|
+|      36|      17|2.3|71.|
+|      37|      11|1.5|73.|
+|      38|      16|2.1|75.|
+|      39|      14|1.9|77.|
+|      40|      15|2.0|79.|
+|      41|      14|1.9|81.|
+|      42|      14|1.9|83.|
+|      43|       8|1.0|84.|
+|      44|      15|2.0|86.|
+|      45|      10|1.3|87.|
+|      46|      12|1.6|89.|
+|      47|      13|1.7|91.|
+|      48|      13|1.7|92.|
+|      49|       5|.68|93.|
+|      50|       5|.68|94.|
+|      51|       3|.41|94.|
+|      52|       7|.95|95.|
+|      53|       6|.82|96.|
+|      54|       2|.27|96.|
+|      55|       2|.27|96.|
+|      56|       2|.27|97.|
+|      57|       3|.41|97.|
+|      58|       1|.13|97.|
+|      59|       3|.41|98.|
+|      61|       1|.13|98.|
+|      62|       3|.41|98.|
+|      63|       1|.13|98.|
+|      64|       1|.13|99.|
+|      65|       2|.27|99.|
+|      70|       1|.13|99.|
+|      78|       1|.13|99.|
+|      79|       1|.13|99.|
+|      80|       1|.13|99.|
+|      94|       1|.13|100|
 +--------+--------+---+---+
-
-+-----------------+---------+
-|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|
-+-----------------+---------+
++-----------------------+--------+
+|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.00|
+|Percentiles 50 (Median)|      29|
++-----------------------+--------+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi