From de57f1dfea55907e1d1f38d1ebe6c9def5c2737d Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 9 Oct 2010 20:57:18 -0700 Subject: [PATCH] tests: Convert very long strings tests to Autotest framework. --- tests/automake.mk | 3 +- tests/command/very-long-strings.sh | 210 ----------------------------- tests/data/sys-file.at | 128 ++++++++++++++++++ tests/{ => data}/v13.sav | Bin tests/{ => data}/v14.sav | Bin 5 files changed, 129 insertions(+), 212 deletions(-) delete mode 100755 tests/command/very-long-strings.sh rename tests/{ => data}/v13.sav (100%) rename tests/{ => data}/v14.sav (100%) diff --git a/tests/automake.mk b/tests/automake.mk index f84097e2..f104ce9a 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/very-long-strings.sh \ tests/formats/bcd-in.sh \ tests/formats/binhex-out.sh \ tests/formats/date-in.sh \ @@ -254,7 +253,7 @@ tests_output_render_test_LDADD = \ EXTRA_DIST += \ $(dist_TESTS) \ tests/coverage.sh tests/test_template \ - tests/v13.sav tests/v14.sav \ + tests/data/v13.sav tests/data/v14.sav \ tests/expressions/randist/beta.out \ tests/expressions/randist/cauchy.out \ tests/expressions/randist/chisq.out \ diff --git a/tests/command/very-long-strings.sh b/tests/command/very-long-strings.sh deleted file mode 100755 index eba37824..00000000 --- a/tests/command/very-long-strings.sh +++ /dev/null @@ -1,210 +0,0 @@ -#!/bin/sh - -# This program tests that very long strings (up to 32767 bytes) can be -# read and written, a la spss v13/v14 - -TEMPDIR=/tmp/pspp-tst-$$ -TESTFILE=$TEMPDIR/`basename $0`.sps - -# ensure that top_srcdir and top_builddir are absolute -if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi -if [ -z "$top_builddir" ] ; then top_builddir=. ; fi -top_srcdir=`cd $top_srcdir; pwd` -top_builddir=`cd $top_builddir; pwd` -PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT - -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 - -# First check that we can read files created with spss versions 13/14 - -activity="Create file 0" -cat > $TESTFILE < $TEMPDIR/data < $TESTFILE < $TESTFILE < data.txt <