X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fweight.sh;h=3b30d530478e826141563df32ea3fe5f8cb9cd63;hb=3e2bf013a731344daed7ab206d4a3c2460688208;hp=d2840edd807b65f7035e7fc2c9d7b68badf692c8;hpb=44d7b18d5c3d0a806fe1a29658445254f2376600;p=pspp-builds.git

diff --git a/tests/command/weight.sh b/tests/command/weight.sh
index d2840edd..3b30d530 100755
--- a/tests/command/weight.sh
+++ b/tests/command/weight.sh
@@ -5,14 +5,21 @@
 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()
 {
@@ -62,27 +69,26 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $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 $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: 
+3.1 FREQUENCIES.  AVAR 
 +--------+--------+---+---+
 |        |        |   |Cum|
 |  Value |  Freq  |Pct|Pct|
@@ -140,7 +146,6 @@ diff -B -b $TEMPDIR/pspp.list - <<EOF
 |      80|       1|  0|100|
 |      94|       1|  0|100|
 +--------+--------+---+---+
-
 +-----------------+---------+
 |N         Valid  |      730|
 |          Missing|        0|