TEMPORARY: Convert test to Autotest framework.

diff --git a/tests/automake.mk b/tests/automake.mk
index e7a802e62cfac2794ce6493782f44d8b4d88551d..2c335b56cc93a104a49943e58901ee27ee056aef 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/temporary.sh \
        tests/bugs/unwritable-dir.sh \
        tests/bugs/val-labs.sh \
        tests/bugs/val-labs-trailing-slash.sh \
@@ -297,6 +296,7 @@ TESTSUITE_AT = \
        tests/language/control/do-if.at \
        tests/language/control/do-repeat.at \
        tests/language/control/loop.at \
+       tests/language/control/temporary.at \
        tests/language/data-io/add-files.at \
        tests/language/data-io/data-list.at \
        tests/language/data-io/data-reader.at \

diff --git a/tests/bugs/temporary.sh b/tests/bugs/temporary.sh
deleted file mode 100755 (executable)
index cb00422..0000000
--- a/tests/bugs/temporary.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-# This program tests for a bug which caused UNIFORM(x) to always return zero.
-
-
-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 NOTABLE /X *.
-begin data.
-1
-2
-3
-4
-5
-6
-7
-8
-9
-end data.
-
-temporary.
-select if x > 5 .
-list.
-
-list.
-EOF
-if [ $? -ne 0 ] ; then no_result ; fi
-
-$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
-if [ $? -ne 0 ] ; then no_result ; fi
-
-
-diff -c $TEMPDIR/pspp.csv - << EOF
-Table: Data List
-X
-6.00
-7.00
-8.00
-9.00
-
-Table: Data List
-X
-1.00
-2.00
-3.00
-4.00
-5.00
-6.00
-7.00
-8.00
-9.00
-EOF
-if [ $? -ne 0 ] ; then fail ; fi
-
-pass;

diff --git a/tests/language/control/temporary.at b/tests/language/control/temporary.at
new file mode 100644 (file)
index 0000000..5ec8bea
--- /dev/null
+++ b/tests/language/control/temporary.at
@@ -0,0 +1,46 @@
+AT_BANNER([TEMPORARY])
+
+dnl Tests for a bug that manifested when all transformations are temporary.
+AT_SETUP([TEMPORARY as first transformation])
+AT_DATA([temporary.sps], [dnl
+DATA LIST LIST NOTABLE /X *.
+BEGIN DATA.
+1
+2
+3
+4
+5
+6
+7
+8
+9
+END DATA.
+
+TEMPORARY.
+SELECT IF x > 5 .
+LIST.
+
+LIST.
+])
+AT_CHECK([pspp -o pspp.csv temporary.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
+Table: Data List
+X
+6.00
+7.00
+8.00
+9.00
+
+Table: Data List
+X
+1.00
+2.00
+3.00
+4.00
+5.00
+6.00
+7.00
+8.00
+9.00
+])
+AT_CLEANUP