From 3c7f102523ad679395c3baf023931ffe88f37d88 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 10 Oct 2010 12:55:45 -0700
Subject: [PATCH] tests: Convert a test for crash on invalid input to Autotest
 framework.

---
 tests/automake.mk         |  1 -
 tests/bugs/data-crash.sh  | 73 ---------------------------------------
 tests/language/command.at | 15 ++++++++
 3 files changed, 15 insertions(+), 74 deletions(-)
 delete mode 100755 tests/bugs/data-crash.sh

diff --git a/tests/automake.mk b/tests/automake.mk
index 4c2c90d4..6a77585a 100644
--- 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
index e00c3d5a..00000000
--- 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 f05086d1..029e1b1f 100644
--- 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])
-- 
2.30.2