From 7fe7c9cbbdeb5867c57a9f6c8bb037e77840e5cb Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 9 Oct 2010 06:57:19 -0700 Subject: [PATCH] USE: Convert tests to Autotest framework. --- tests/automake.mk | 2 +- tests/command/use.sh | 103 ------------------------------- tests/language/utilities/date.at | 36 +++++++++++ 3 files changed, 37 insertions(+), 104 deletions(-) delete mode 100755 tests/command/use.sh create mode 100644 tests/language/utilities/date.at diff --git a/tests/automake.mk b/tests/automake.mk index 6ba31ad4..62a8937e 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -10,7 +10,6 @@ TESTS_ENVIRONMENT += LC_ALL=C TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT) dist_TESTS = \ - tests/command/use.sh \ tests/command/variable-display.sh \ tests/command/vector.sh \ tests/command/very-long-strings.sh \ @@ -357,6 +356,7 @@ TESTSUITE_AT = \ tests/language/stats/roc.at \ tests/language/stats/sort-cases.at \ tests/language/stats/t-test.at \ + tests/language/utilities/date.at \ tests/language/utilities/insert.at \ tests/language/utilities/permissions.at \ tests/language/utilities/set.at \ diff --git a/tests/command/use.sh b/tests/command/use.sh deleted file mode 100755 index 070e29ee..00000000 --- a/tests/command/use.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# This program tests USE, just to make sure that USE ALL is accepted silently. - -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/filter.stat << EOF -data list notable /X 1-2. -begin data. -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -end data. -use all. -list. - -EOF -if [ $? -ne 0 ] ; then no_result ; fi - - -activity="run program" -$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/filter.stat -if [ $? -ne 0 ] ; then no_result ; fi - - -activity="check results" -diff -c $TEMPDIR/pspp.csv - << EOF -Table: Data List -X -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -EOF -if [ $? -ne 0 ] ; then fail ; fi - -pass; diff --git a/tests/language/utilities/date.at b/tests/language/utilities/date.at new file mode 100644 index 00000000..ab1ca12b --- /dev/null +++ b/tests/language/utilities/date.at @@ -0,0 +1,36 @@ +AT_BANNER([USE]) + +AT_SETUP([USE ALL]) +AT_DATA([use.sps], [dnl +data list notable /X 1-2. +begin data. +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +end data. +use all. +list. +]) +AT_CHECK([pspp -o pspp.csv use.sps]) +AT_CHECK([cat pspp.csv], [0], [dnl +Table: Data List +X +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +]) +AT_CLEANUP -- 2.30.2