From e05ae8e87fdc4eb8a7d7172a9a08950387e8be05 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 8 Aug 2010 22:16:05 -0700 Subject: [PATCH] ADD FILES: Convert testsuite to use Autotest. --- tests/automake.mk | 2 +- tests/command/add-files.sh | 200 ---------------------------- tests/language/data-io/add-files.at | 110 +++++++++++++++ 3 files changed, 111 insertions(+), 201 deletions(-) delete mode 100755 tests/command/add-files.sh create mode 100644 tests/language/data-io/add-files.at diff --git a/tests/automake.mk b/tests/automake.mk index 7da5514d..fd509864 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/add-files.sh \ tests/command/beg-data.sh \ tests/command/bignum.sh \ tests/command/count.sh \ @@ -417,6 +416,7 @@ EXTRA_DIST += \ TESTSUITE_AT = \ tests/data/calendar.at \ + tests/language/data-io/add-files.at \ tests/language/data-io/data-list.at \ tests/language/data-io/save.at \ tests/language/data-io/save-translate.at \ diff --git a/tests/command/add-files.sh b/tests/command/add-files.sh deleted file mode 100755 index 4cba8ceb..00000000 --- a/tests/command/add-files.sh +++ /dev/null @@ -1,200 +0,0 @@ -#!/bin/sh - -# This program tests the ADD FILES procedure - -TEMPDIR=/tmp/pspp-tst-$$ -TESTFILE=$TEMPDIR/add-files.pspp - - -# 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="data create" -cat > a.data < b.data < concatenate.csv < interleave.csv < $name.pspp - if [ $? -ne 0 ] ; then no_result ; fi - - activity="run $name.pspp" - $SUPERVISOR $PSPP -o pspp.csv $name.pspp - if [ $? -ne 0 ] ; then no_result ; fi - - activity="check $name output" - perl -pi -e 's/^\s*$//g' pspp.csv - perl -pi -e 's/^\s*$//g' $type.csv - diff -u -b -w pspp.csv $type.csv - if [ $? -ne 0 ] ; then fail ; fi - done -done - -pass; diff --git a/tests/language/data-io/add-files.at b/tests/language/data-io/add-files.at new file mode 100644 index 00000000..d6650819 --- /dev/null +++ b/tests/language/data-io/add-files.at @@ -0,0 +1,110 @@ +m4_define([CHECK_ADD_FILES], + [AT_SETUP([ADD FILES -- $1 $2 with $3]) + AT_DATA([a.data], [dnl +1aB +8aM +3aE +5aG +0aA +5aH +6aI +7aJ +2aD +7aK +1aC +7aL +4aF +]) + AT_DATA([b.data], [dnl +1bN +3bO +4bP +6bQ +7bR +9bS +]) + m4_if([$2], [sav], + [AT_DATA([save-a.sps], [dnl +DATA LIST NOTABLE FILE='a.data' /a b c 1-3 (A). +SAVE OUTFILE='a.sav'. +]) + AT_CHECK([pspp -O format=csv save-a.sps])]) + m4_if([$3], [sav], + [AT_DATA([save-b.sps], [dnl +DATA LIST NOTABLE FILE='b.data' /a b c 1-3 (A). +SAVE OUTFILE='b.sav'. +]) + AT_CHECK([pspp -O format=csv save-b.sps])]) + m4_if([$1], [interleave], + [m4_pushdef([BY], [[/BY a /FIRST=first /LAST=last]]) + m4_pushdef([SORT], [[/SORT]])], + [m4_pushdef([BY], []) + m4_pushdef([SORT], [])]) + AT_DATA([add-files.sps], [dnl +m4_if([$2], [sav], [], [DATA LIST NOTABLE FILE='a.data' /a b c 1-3 (A).]) +m4_if([$3], [sav], [], [DATA LIST NOTABLE FILE='b.data' /a b c 1-3 (A).]) +ADD FILES + m4_if([$2], [sav], [FILE='a.sav'], [FILE=*]) /IN=InA SORT + m4_if([$3], [sav], [FILE='b.sav'], [FILE=*]) /IN=InB /RENAME c=d + BY[]. +LIST. +]) + m4_popdef([BY]) + m4_popdef([SORT]) + AT_CHECK([pspp -O format=csv add-files.sps], [0], +[m4_if([$1], [interleave], [dnl +Table: Data List +a,b,c,d,InA,InB,first,last +0,a,A,,1,0,1,1 +1,a,B,,1,0,1,0 +1,a,C,,1,0,0,0 +1,b,,N,0,1,0,1 +2,a,D,,1,0,1,1 +3,a,E,,1,0,1,0 +3,b,,O,0,1,0,1 +4,a,F,,1,0,1,0 +4,b,,P,0,1,0,1 +5,a,G,,1,0,1,0 +5,a,H,,1,0,0,1 +6,a,I,,1,0,1,0 +6,b,,Q,0,1,0,1 +7,a,J,,1,0,1,0 +7,a,K,,1,0,0,0 +7,a,L,,1,0,0,0 +7,b,,R,0,1,0,1 +8,a,M,,1,0,1,1 +9,b,,S,0,1,1,1 +], [dnl +Table: Data List +a,b,c,d,InA,InB +1,a,B,,1,0 +8,a,M,,1,0 +3,a,E,,1,0 +5,a,G,,1,0 +0,a,A,,1,0 +5,a,H,,1,0 +6,a,I,,1,0 +7,a,J,,1,0 +2,a,D,,1,0 +7,a,K,,1,0 +1,a,C,,1,0 +7,a,L,,1,0 +4,a,F,,1,0 +1,b,,N,0,1 +3,b,,O,0,1 +4,b,,P,0,1 +6,b,,Q,0,1 +7,b,,R,0,1 +9,b,,S,0,1 +])]) +AT_CLEANUP +]) + +AT_BANNER([ADD FILES]) + +CHECK_ADD_FILES([interleave], [sav], [sav]) +CHECK_ADD_FILES([interleave], [sav], [inline]) +CHECK_ADD_FILES([interleave], [inline], [sav]) +CHECK_ADD_FILES([concatenate], [sav], [sav]) +CHECK_ADD_FILES([concatenate], [sav], [inline]) +CHECK_ADD_FILES([concatenate], [inline], [sav]) -- 2.30.2