Fixed some buglets in the tests

[pspp-builds.git] / tests / command / sample.sh

diff --git a/tests/command/sample.sh b/tests/command/sample.sh
index b5ab80e71fbee50de4f0b2fd840c5913afed97fd..6d3317e43a70af5a73228a60a4145581924f9d26 100755 (executable)
--- a/tests/command/sample.sh
+++ b/tests/command/sample.sh
@@ -50,7 +50,7 @@ activity="create program"
 cat > $TEMPDIR/sample.stat <<EOF
 set seed=3
 
-data list /a 1-2.
+data list notable /a 1-2.
 begin data.
 1
 2
@@ -73,22 +73,42 @@ activity="run program"
 $here/../src/pspp -o raw-ascii --testing-mode $TEMPDIR/sample.stat 
 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 the command file.
-+--------+------+-------+------+
-|Variable|Record|Columns|Format|
-#========#======#=======#======#
-|A       |     1|  1-  2|F2.0  |
-+--------+------+-------+------+
+activity="create head"
+grep -v '^\ *$' $TEMPDIR/pspp.list | head -2 > $TEMPDIR/head
+if [ $? -ne 0 ] ; then no_result ; fi
+
+activity="extract data"
+grep  '[0-9][0-9]*' $TEMPDIR/pspp.list > $TEMPDIR/data
+if [ $? -ne 0 ] ; then no_result ; fi
 
+
+activity="compare head"
+diff -B -b $TEMPDIR/head - << EOF
  A
 --
- 2
- 6
- 9 
-10 
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
+activity="compare data"
+diff -w $TEMPDIR/data - << EOF > $TEMPDIR/diffs
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+EOF
+# note   vv 
+if [ $? -eq 0 ] ; then fail ; fi
+
+# Check that there was nothing added
+grep '^<' $TEMPDIR/diffs
+# note   vv
+if [ $? -eq 0 ] ; then fail ; fi
+
+
 pass;