From edfe2dfe589dcb48bf12942aeeb7b057bb1ebb35 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 9 Oct 2010 21:39:43 -0700 Subject: [PATCH] GET: Convert some more tests to Autotest. --- tests/automake.mk | 3 +- tests/bugs/get-no-file.sh | 74 --------------------- tests/bugs/get.sh | 122 ---------------------------------- tests/language/data-io/get.at | 64 ++++++++++++++++++ 4 files changed, 65 insertions(+), 198 deletions(-) delete mode 100755 tests/bugs/get-no-file.sh delete mode 100755 tests/bugs/get.sh create mode 100644 tests/language/data-io/get.at diff --git a/tests/automake.mk b/tests/automake.mk index e9c78ae1..a60b344b 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -31,8 +31,6 @@ dist_TESTS = \ tests/bugs/compression.sh \ tests/bugs/curtailed.sh \ tests/bugs/data-crash.sh \ - tests/bugs/get.sh \ - tests/bugs/get-no-file.sh \ tests/bugs/if_crash.sh \ tests/bugs/input-crash.sh \ tests/bugs/multipass.sh \ @@ -317,6 +315,7 @@ TESTSUITE_AT = \ tests/language/data-io/get-data-gnm.at \ tests/language/data-io/get-data-psql.at \ tests/language/data-io/get-data-txt.at \ + tests/language/data-io/get.at \ tests/language/data-io/list.at \ tests/language/data-io/match-files.at \ tests/language/data-io/print.at \ diff --git a/tests/bugs/get-no-file.sh b/tests/bugs/get-no-file.sh deleted file mode 100755 index 97fd7b6c..00000000 --- a/tests/bugs/get-no-file.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh - -# This program tests for a bug which caused a crash when -# GET specified a non-existent file - -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 < /dev/null -if [ $? -ne 1 ] ; then fail ; fi - -pass diff --git a/tests/bugs/get.sh b/tests/bugs/get.sh deleted file mode 100755 index 3fd6d562..00000000 --- a/tests/bugs/get.sh +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh - -# This program tests for a bug which caused -# the second procedure after GET FILE to corrupt its output - - -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 <