tests: Convert a test for crash on invalid input to Autotest framework.

diff --git a/tests/automake.mk b/tests/automake.mk
index 4c2c90d405e5be97c3f1206418475a7291b1f497..6a77585ab42ea8184022fe58af94c180b71a16d3 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -29,7 +29,6 @@ dist_TESTS = \
        tests/formats/360.sh \
        tests/bugs/comment-at-eof.sh \
        tests/bugs/curtailed.sh \
-       tests/bugs/data-crash.sh \
        tests/bugs/if_crash.sh \
        tests/bugs/input-crash.sh \
        tests/bugs/multipass.sh \

diff --git a/tests/bugs/data-crash.sh b/tests/bugs/data-crash.sh
deleted file mode 100755 (executable)
index e00c3d5..0000000
--- a/tests/bugs/data-crash.sh
+++ /dev/null
@@ -1,73 +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 > $TEMPDIR/ct.stat <<EOF
-DATA rubbish.
-EXECUTE.
-
-EOF
-if [ $? -ne 0 ] ; then no_result ; fi
-
-#This must fail
-activity="run program"
-$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TEMPDIR/ct.stat 
-if [ $? -ne 1 ] ; then fail ; fi
-
-pass;

diff --git a/tests/language/command.at b/tests/language/command.at
index f05086d1e7068f79697921333a503eaa518141e3..029e1b1fb9dab3f97899aca61f8730aac28e3073 100644 (file)
--- a/tests/language/command.at
+++ b/tests/language/command.at
@@ -1,3 +1,18 @@
+AT_BANNER([command parser])
+
+dnl Tests for a bug which crashed pspp when given certain invalid input.
+AT_SETUP([command parser crash bug])
+AT_DATA([command.sps], [dnl
+DATA rubbish.
+EXECUTE.
+])
+AT_CHECK([pspp -O format=csv command.sps], [1], [dnl
+command.sps:1: error: Unknown command DATA RUBBISH.
+
+command.sps:2: error: EXECUTE: EXECUTE is allowed only after the active file has been defined.
+])
+AT_CLEANUP
+
 AT_BANNER([ERASE])
 
 AT_SETUP([ERASE -- safer mode])