Added test/command/regression.sh to test/automake.mk

Extended test/command/count.sh to test  multiple  variables counts.

diff --git a/tests/automake.mk b/tests/automake.mk
index cfe41fa1451dddea00c1d7e378d27dc1f5e1610e..08da8e3ce014e0298882170e1352d2fbdc1d8ee3 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -32,6 +32,7 @@ TESTS = \
        tests/command/permissions.sh \
        tests/command/print.sh \
        tests/command/rename.sh \
+       tests/command/regression.sh \
        tests/command/sample.sh \
        tests/command/sort.sh \
        tests/command/sysfiles.sh \

diff --git a/tests/command/count.sh b/tests/command/count.sh
index 6a34eba020ceed096b9878ca9de834aeb144685f..dd4cfd97e408e3aa38bbc91c41709ea7189c9ba6 100755 (executable)
--- a/tests/command/count.sh
+++ b/tests/command/count.sh
@@ -52,6 +52,7 @@ mkdir -p $TEMPDIR
 
 cd $TEMPDIR
 
+activity="Create File 1"
 cat > $TESTFILE <<EOF
 title 'Test COUNT transformation'.
 
@@ -72,6 +73,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
+activity="Run pspp 1"
 $SUPERVISOR $PSPP -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
@@ -99,4 +101,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 -o raw-ascii $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;