From b9fef27879f4ed4c19a612fe0f1dc2abaa623832 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 10 Oct 2010 13:59:07 -0700 Subject: [PATCH] tests: Convert tests for overwriting files to Autotest framework. --- tests/automake.mk | 2 +- tests/bugs/overwrite-input-file.sh | 197 ----------------------------- tests/data/por-file.at | 65 ++++++++++ tests/data/sys-file.at | 65 ++++++++++ tests/language/data-io/print.at | 50 ++++++++ 5 files changed, 181 insertions(+), 198 deletions(-) delete mode 100755 tests/bugs/overwrite-input-file.sh create mode 100644 tests/data/por-file.at diff --git a/tests/automake.mk b/tests/automake.mk index 3a0e5c05..3a156351 100644 --- 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/bugs/overwrite-input-file.sh \ tests/bugs/overwrite-special-file.sh \ tests/bugs/shbang.sh \ tests/bugs/signals.sh \ @@ -295,6 +294,7 @@ EXTRA_DIST += \ TESTSUITE_AT = \ tests/data/calendar.at \ tests/data/data-in.at \ + tests/data/por-file.at \ tests/data/sys-file.at \ tests/language/command.at \ tests/language/control/do-if.at \ diff --git a/tests/bugs/overwrite-input-file.sh b/tests/bugs/overwrite-input-file.sh deleted file mode 100755 index f1beabcc..00000000 --- a/tests/bugs/overwrite-input-file.sh +++ /dev/null @@ -1,197 +0,0 @@ -#!/bin/sh - -# This program tests that simultaneous input and output to a single -# file properly coexist, with the output atomically replacing the -# input if successful. - -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 data file" -cat > foo.data < $TESTFILE < $TESTFILE </dev/null 2>&1 -# PSPP should have terminated with a signal. POSIX requires that the exit -# status of a process terminated by a signal be greater than 128. -if [ $? -le 128 ] ; then no_result ; fi - -activity="check for remaining temporary files" -if test -e *.tmp*; then fail; fi - -activity="compare output 1" -cmp foo.sav foo.sav.backup -if [ $? -ne 0 ] ; then fail ; fi - -activity="compare output 2" -cmp foo.por foo.por.backup -if [ $? -ne 0 ] ; then fail ; fi - -activity="compare output 3" -cmp foo.data foo.data.backup -if [ $? -ne 0 ] ; then fail ; fi - - -activity="create program 3" -cat > $TESTFILE < $TESTFILE <