tests: Convert test for variables in expressions to Autotest.

diff --git a/tests/automake.mk b/tests/automake.mk
index 63bb79b8ba8d90e205de0f9efa355775191ad739..45b6af4b9febd2a3add1bc8f2178f84c32c4220f 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/expressions/variables.sh \
        tests/expressions/vectors.sh
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)

diff --git a/tests/expressions/variables.sh b/tests/expressions/variables.sh
deleted file mode 100755 (executable)
index 5d09849..0000000
--- a/tests/expressions/variables.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-
-# This program tests use of variables in expressions.
-
-TEMPDIR=/tmp/pspp-tst-$$
-
-# ensure that top_srcdir and top_builddir  are absolute
-if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
-if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
-top_srcdir=`cd $top_srcdir; pwd`
-top_builddir=`cd $top_builddir; pwd`
-PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
-
-STAT_CONFIG_PATH=$top_srcdir/config
-export STAT_CONFIG_PATH
-
-LANG=C
-export LANG
-
-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/variables.stat <<EOF
-SET MXERR 1000.
-SET MXWARN 1000.
-
-DATA LIST /N1 TO N5 1-5.
-MISSING VALUES N1 TO N5 (3 THRU 5, 1).
-BEGIN DATA.
-12345
-6789 
-END DATA.
-
-COMPUTE P1=N1.
-COMPUTE P2=N2.
-COMPUTE P3=N3.
-COMPUTE P4=N4.
-COMPUTE P5=N5.
-
-COMPUTE MC=NMISS(N1 TO N5).
-COMPUTE VC=NVALID(N1 TO N5).
-
-COMPUTE S1=SYSMIS(N1).
-COMPUTE S2=SYSMIS(N2).
-COMPUTE S3=SYSMIS(N3).
-COMPUTE S4=SYSMIS(N4).
-COMPUTE S5=SYSMIS(N5).
-
-COMPUTE M1=MISSING(N1).
-COMPUTE M2=MISSING(N2).
-COMPUTE M3=MISSING(N3).
-COMPUTE M4=MISSING(N4).
-COMPUTE M5=MISSING(N5).
-
-COMPUTE V1=VALUE(N1).
-COMPUTE V2=VALUE(N2).
-COMPUTE V3=VALUE(N3).
-COMPUTE V4=VALUE(N4).
-COMPUTE V5=VALUE(N5).
-
-FORMATS ALL (F1).
-
-LIST.
-EOF
-if [ $? -ne 0 ] ; then no_result ; fi
-
-activity="run program"
-$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/variables.stat > $TEMPDIR/variables.err 2> $TEMPDIR/variables.out
-if [ $? -ne 0 ] ; then fail ; fi
-
-activity="compare results"
-diff -c $TEMPDIR/pspp.csv - <<EOF
-Table: Reading 1 record from INLINE.
-Variable,Record,Columns,Format
-N1,1,1-  1,F1.0
-N2,1,2-  2,F1.0
-N3,1,3-  3,F1.0
-N4,1,4-  4,F1.0
-N5,1,5-  5,F1.0
-
-Table: Data List
-N1,N2,N3,N4,N5,P1,P2,P3,P4,P5,MC,VC,S1,S2,S3,S4,S5,M1,M2,M3,M4,M5,V1,V2,V3,V4,V5
-1,2,3,4,5,.,2,.,.,.,4,1,0,0,0,0,0,1,0,1,1,1,1,2,3,4,5
-6,7,8,9,.,6,7,8,9,.,1,4,0,0,0,0,1,0,0,0,0,1,6,7,8,9,.
-EOF
-
-if [ $? -ne 0 ] ; then no_result ; fi
-
-
-if [ $? -ne 0 ] ; then fail ; fi
-
-
-
-pass;

diff --git a/tests/language/expressions/evaluate.at b/tests/language/expressions/evaluate.at
index d06270af0f09a0816c9a4d9f1a7578e9fce871cf..6740a4a6e4d9ccd76f14f9bbf7e76af864f16192 100644 (file)
--- a/tests/language/expressions/evaluate.at
+++ b/tests/language/expressions/evaluate.at
@@ -1986,3 +1986,52 @@ n,s,nlabel,slabel
 6,g,,
 ])
 AT_CLEANUP
+
+AT_SETUP([variables in expressions])
+AT_DATA([variables.sps], [dnl
+DATA LIST NOTABLE/N1 TO N5 1-5.
+MISSING VALUES N1 TO N5 (3 THRU 5, 1).
+BEGIN DATA.
+12345
+6789 
+END DATA.
+
+COMPUTE P1=N1.
+COMPUTE P2=N2.
+COMPUTE P3=N3.
+COMPUTE P4=N4.
+COMPUTE P5=N5.
+
+COMPUTE MC=NMISS(N1 TO N5).
+COMPUTE VC=NVALID(N1 TO N5).
+
+COMPUTE S1=SYSMIS(N1).
+COMPUTE S2=SYSMIS(N2).
+COMPUTE S3=SYSMIS(N3).
+COMPUTE S4=SYSMIS(N4).
+COMPUTE S5=SYSMIS(N5).
+
+COMPUTE M1=MISSING(N1).
+COMPUTE M2=MISSING(N2).
+COMPUTE M3=MISSING(N3).
+COMPUTE M4=MISSING(N4).
+COMPUTE M5=MISSING(N5).
+
+COMPUTE V1=VALUE(N1).
+COMPUTE V2=VALUE(N2).
+COMPUTE V3=VALUE(N3).
+COMPUTE V4=VALUE(N4).
+COMPUTE V5=VALUE(N5).
+
+FORMATS ALL (F1).
+
+LIST.
+])
+AT_CHECK([pspp -o pspp.csv variables.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
+Table: Data List
+N1,N2,N3,N4,N5,P1,P2,P3,P4,P5,MC,VC,S1,S2,S3,S4,S5,M1,M2,M3,M4,M5,V1,V2,V3,V4,V5
+1,2,3,4,5,.,2,.,.,.,4,1,0,0,0,0,0,1,0,1,1,1,1,2,3,4,5
+6,7,8,9,.,6,7,8,9,.,1,4,0,0,0,0,1,0,0,0,0,1,6,7,8,9,.
+])
+AT_CLEANUP