From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 24 Mar 2006 02:10:49 +0000 (+0000)
Subject: Added test/command/regression.sh to test/automake.mk
X-Git-Tag: v0.6.0~1034
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcbf95b3fbf812c42bd352943a9b358fa584deef;p=pspp-builds.git

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 cfe41fa1..08da8e3c 100644
--- 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 6a34eba0..dd4cfd97 100755
--- 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;