X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fcount.sh;h=7c70fa2113b478e7f6a07eb4b0d7f3d25e3fd7d2;hb=274c90615ffd6975784232b709cff0b99da8b38d;hp=6a34eba020ceed096b9878ca9de834aeb144685f;hpb=65a4e29574b67921ea899b6a1d45806dca11db00;p=pspp-builds.git

diff --git a/tests/command/count.sh b/tests/command/count.sh
index 6a34eba0..7c70fa21 100755
--- a/tests/command/count.sh
+++ b/tests/command/count.sh
@@ -17,6 +17,8 @@ top_srcdir=`cd $top_srcdir; pwd`
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
 
+LANG=C
+export LANG
 
 cleanup()
 {
@@ -52,6 +54,7 @@ mkdir -p $TEMPDIR
 
 cd $TEMPDIR
 
+activity="Create File 1"
 cat > $TESTFILE <<EOF
 title 'Test COUNT transformation'.
 
@@ -72,11 +75,12 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-$SUPERVISOR $PSPP -o raw-ascii $TESTFILE
+activity="Run pspp 1"
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-activity="compare results"
+activity="compare results 1"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff -b  $TEMPDIR/pspp.list - <<EOF
 1.1 DATA LIST.  Reading 1 record from INLINE.
@@ -99,4 +103,49 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
+
+
+activity="Create file 2"
+cat > $TESTFILE <<EOF
+data list list /x * y *.
+begin data.
+1 2
+2 3
+4 5
+2 2
+5 6
+end data.
+
+count C=x y (2).
+
+list.
+EOF
+if [ $? -ne 0 ] ; then no_result ; fi
+
+
+activity="Run pspp 2"
+$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
+1.1 DATA LIST.  Reading free-form data from INLINE.
++--------+------+
+|Variable|Format|
+#========#======#
+|x       |F8.0  |
+|y       |F8.0  |
++--------+------+
+       x        y        C
+-------- -------- --------
+    1.00     2.00     1.00 
+    2.00     3.00     1.00 
+    4.00     5.00      .00 
+    2.00     2.00     2.00 
+    5.00     6.00      .00 
+EOF
+if [ $? -ne 0 ] ; then fail ; fi
+
 pass;