[Pspp-cvs] pspp/tests automake.mk command/count.sh

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Branch:         
Changes by:     John Darrington <address@hidden>        06/03/24 02:10:49

Modified files:
        tests          : automake.mk 
        tests/command  : count.sh 

Log message:
        Added test/command/regression.sh to test/automake.mk
        Extended test/command/count.sh to test  multiple  variables counts.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/automake.mk.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/count.sh.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: pspp/tests/automake.mk
diff -u pspp/tests/automake.mk:1.2 pspp/tests/automake.mk:1.3
--- pspp/tests/automake.mk:1.2  Sat Mar  4 05:01:06 2006
+++ pspp/tests/automake.mk      Fri Mar 24 02:10:49 2006
@@ -32,6 +32,7 @@
        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 \
Index: pspp/tests/command/count.sh
diff -u pspp/tests/command/count.sh:1.11 pspp/tests/command/count.sh:1.12
--- pspp/tests/command/count.sh:1.11    Sat Mar 11 07:16:40 2006
+++ pspp/tests/command/count.sh Fri Mar 24 02:10:49 2006
@@ -52,6 +52,7 @@
 
 cd $TEMPDIR
 
+activity="Create File 1"
 cat > $TESTFILE <<EOF
 title 'Test COUNT transformation'.
 
@@ -72,6 +73,7 @@
 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 @@
 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;