tests: Convert IMPORT and EXPORT test to use Autotest.

diff --git a/tests/automake.mk b/tests/automake.mk
index 88ca603acc12773a359f43d55da11cff0a663d76..5bb9fa7ca51150cee73ee0fca584d82e3993b45b 100644 (file)
--- 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/import-export.sh \
        tests/command/insert.sh \
        tests/command/lag.sh \
        tests/command/line-ends.sh \

diff --git a/tests/command/import-export.sh b/tests/command/import-export.sh
deleted file mode 100755 (executable)
index e63eb2f..0000000
--- a/tests/command/import-export.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# This program tests the IMPORT and EXPORT commands
-
-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 Y.
-BEGIN DATA.
-1 2
-3 .
-5 6
-END DATA.
-
-EXPORT /OUTFILE='wiz.por'.
-IMPORT /FILE='wiz.por'.
-
-LIST.
-EOF
-if [ $? -ne 0 ] ; then no_result ; fi
-
-
-activity="run program"
-$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
-if [ $? -ne 0 ] ; then no_result ; fi
-
-activity="compare output"
-diff -c $TEMPDIR/pspp.csv - << EOF
-Table: Data List
-X,Y
-1.00,2.00
-3.00,.  
-5.00,6.00
-EOF
-if [ $? -ne 0 ] ; then fail ; fi
-
-pass;

diff --git a/tests/language/data-io/save.at b/tests/language/data-io/save.at
index 28a186ffba49fc7351538e9e59cf63ca3437868f..8e3a4860c73bfe5b5b24351a0567876b6876aa09 100644 (file)
--- a/tests/language/data-io/save.at
+++ b/tests/language/data-io/save.at
@@ -1,3 +1,29 @@
+AT_BANNER([IMPORT and EXPORT])
+
+AT_SETUP([IMPORT and EXPORT])
+AT_DATA([import-export.sps], [dnl
+DATA LIST LIST NOTABLE /X Y.
+BEGIN DATA.
+1 2
+3 .
+5 6
+END DATA.
+
+EXPORT /OUTFILE='wiz.por'.
+IMPORT /FILE='wiz.por'.
+
+LIST.
+])
+AT_CHECK([pspp -o pspp.csv import-export.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
+Table: Data List
+X,Y
+1.00,2.00
+3.00,.  @&t@
+5.00,6.00
+])
+AT_CLEANUP
+
 AT_BANNER([SAVE])
 
 # UNSELECTED=DELETE used to cause a crash if there was actually a