q2c: Convert test to Autotest framework.

diff --git a/tests/automake.mk b/tests/automake.mk
index e14cd23de5804207985defc382a3c2956e6fc7c6..b043ef937fd76496847fd331987392e27c91694b 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -27,7 +27,6 @@ dist_TESTS = \
        tests/formats/wkday-in.sh \
        tests/formats/wkday-out.sh \
        tests/formats/360.sh \
-       tests/bugs/curtailed.sh \
        tests/bugs/if_crash.sh \
        tests/bugs/multipass.sh \
        tests/bugs/overwrite-input-file.sh \
@@ -328,6 +327,7 @@ TESTSUITE_AT = \
        tests/language/dictionary/vector.at \
        tests/language/dictionary/weight.at \
        tests/language/expressions/evaluate.at \
+       tests/language/lexer/q2c.at \
        tests/language/lexer/variable-parser.at \
        tests/language/stats/aggregate.at \
        tests/language/stats/autorecode.at \

diff --git a/tests/bugs/curtailed.sh b/tests/bugs/curtailed.sh
deleted file mode 100755 (executable)
index bbdeb6a..0000000
--- a/tests/bugs/curtailed.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-# This program tests for a bug which crashed pspp when given certain
-# invalid input
-
-TEMPDIR=/tmp/pspp-tst-$$
-TESTFILE=$TEMPDIR/`basename $0`.sps
-
-# ensure that top_builddir  are absolute
-if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
-if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
-top_builddir=`cd $top_builddir; pwd`
-PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
-
-# ensure that top_srcdir is absolute
-top_srcdir=`cd $top_srcdir; pwd`
-
-STAT_CONFIG_PATH=$top_srcdir/config
-export STAT_CONFIG_PATH
-
-
-cleanup()
-{
-     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
-       echo "NOT cleaning $TEMPDIR" 
-       return ; 
-     fi
-     cd /
-     rm -rf $TEMPDIR
-}
-
-
-fail()
-{
-    echo $activity
-    echo FAILED
-    cleanup;
-    exit 1;
-}
-
-
-no_result()
-{
-    echo $activity
-    echo NO RESULT;
-    cleanup;
-    exit 2;
-}
-
-pass()
-{
-    cleanup;
-    exit 0;
-}
-
-mkdir -p $TEMPDIR
-
-cd $TEMPDIR
-
-activity="create program"
-cat > $TESTFILE <<EOF
-DATA LIST LIST /x *.
-BEGIN DATA.
-1
-2
-3
-END DATA.
-
-EXAMINE.
-ONEWAY.
-CROSSTABS.
-EOF
-if [ $? -ne 0 ] ; then no_result ; fi
-
-#This must fail
-activity="run program"
-$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TESTFILE
-if [ $? -ne 1 ] ; then fail ; fi
-
-
-pass;

diff --git a/tests/language/lexer/q2c.at b/tests/language/lexer/q2c.at
new file mode 100644 (file)
index 0000000..eeeed8d
--- /dev/null
+++ b/tests/language/lexer/q2c.at
@@ -0,0 +1,23 @@
+AT_BANNER([q2c])
+
+AT_SETUP([q2c enforces mandatory subcommands])
+AT_DATA([q2c.sps], [dnl
+DATA LIST LIST NOTABLE /x *.
+BEGIN DATA.
+1
+2
+3
+END DATA.
+
+EXAMINE.
+ONEWAY.
+CROSSTABS.
+])
+AT_CHECK([pspp -O format=csv q2c.sps], [1], [dnl
+q2c.sps:8: error: EXAMINE: VARIABLES subcommand must be given.
+
+q2c.sps:9: error: ONEWAY: Syntax error at end of command: expecting variable name.
+
+q2c.sps:10: error: CROSSTABS: TABLES subcommand must be given.
+])
+AT_CLEANUP