From: Ben Pfaff Date: Sun, 31 Jul 2005 04:55:58 +0000 (+0000) Subject: Sat Jul 30 21:54:23 2005 Ben Pfaff X-Git-Tag: v0.4.0~25 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44d7b18d5c3d0a806fe1a29658445254f2376600;p=pspp-builds.git Sat Jul 30 21:54:23 2005 Ben Pfaff * command/sys-info.sh: Removed. (This was not actually in TESTS in Makefile.am, so it was never called. tests/command/sysfile-info.sh does what it was trying to do, but better.) Sat Jul 30 21:50:33 2005 Ben Pfaff Fixes for Solaris. * Most tests: Add `cd /' before `rm -rf $TEMPDIR' because some OSes do not allow the current working directory to be removed. * bugs/big-input-2.sh: Use perl instead of a shell loop, because the shell loop was very slow on Solaris. * command/sort.sh: Use `printf' instead of `echo -n' for portability. --- diff --git a/tests/ChangeLog b/tests/ChangeLog index 19646bf3..9fd3fdbf 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,23 @@ +Sat Jul 30 21:54:23 2005 Ben Pfaff + + * command/sys-info.sh: Removed. (This was not actually in TESTS + in Makefile.am, so it was never called. + tests/command/sysfile-info.sh does what it was trying to do, but + better.) + +Sat Jul 30 21:50:33 2005 Ben Pfaff + + Fixes for Solaris. + + * Most tests: Add `cd /' before `rm -rf $TEMPDIR' because some + OSes do not allow the current working directory to be removed. + + * bugs/big-input-2.sh: Use perl instead of a shell loop, because + the shell loop was very slow on Solaris. + + * command/sort.sh: Use `printf' instead of `echo -n' for + portability. + Sat Jul 30 21:48:37 2005 Ben Pfaff * Makefile.am: Add coverage.sh, temp_template to EXTRA_DIST. diff --git a/tests/bugs/agg-crash-2.sh b/tests/bugs/agg-crash-2.sh index 17818161..cd2fd1e3 100755 --- a/tests/bugs/agg-crash-2.sh +++ b/tests/bugs/agg-crash-2.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/agg_crash.sh b/tests/bugs/agg_crash.sh index de2b1989..fb2556f9 100755 --- a/tests/bugs/agg_crash.sh +++ b/tests/bugs/agg_crash.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/alpha-freq.sh b/tests/bugs/alpha-freq.sh index b3a9d09a..2889a063 100755 --- a/tests/bugs/alpha-freq.sh +++ b/tests/bugs/alpha-freq.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/big-input-2.sh b/tests/bugs/big-input-2.sh index 0fea4aba..5a3c6da0 100755 --- a/tests/bugs/big-input-2.sh +++ b/tests/bugs/big-input-2.sh @@ -19,6 +19,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } @@ -56,16 +57,10 @@ if [ $? -ne 0 ] ; then no_result ; fi printf "Creating input data. Please wait" activity="create data" -( while true ; do - echo AB12; -done ) | head -100000 >> $TEMPDIR/large.dat +$PERL -e 'print "AB12\n" foreach 1...100000; + print "AB04\n" foreach 1...100000;' > $TEMPDIR/large.dat if [ $? -ne 0 ] ; then no_result ; fi -printf '.' -( while true ; do - echo AB04; -done ) | head -100000 >> $TEMPDIR/large.dat -if [ $? -ne 0 ] ; then no_result ; fi -printf "\n"; +printf ".\n"; activity="create program" cat > $TESTFILE <> $TEMPDIR/large.dat +$PERL -e 'print "AB04\nAB12\n" foreach 1...25000' >> $TEMPDIR/large.dat if [ $? -ne 0 ] ; then no_result ; fi activity="run program" diff --git a/tests/bugs/big-input.sh b/tests/bugs/big-input.sh index 84fc288b..2d1ade75 100755 --- a/tests/bugs/big-input.sh +++ b/tests/bugs/big-input.sh @@ -18,6 +18,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/comment-at-eof.sh b/tests/bugs/comment-at-eof.sh index c1e2aae6..0388146d 100755 --- a/tests/bugs/comment-at-eof.sh +++ b/tests/bugs/comment-at-eof.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/compute-fmt.sh b/tests/bugs/compute-fmt.sh index eada06b7..e9b8617c 100755 --- a/tests/bugs/compute-fmt.sh +++ b/tests/bugs/compute-fmt.sh @@ -18,6 +18,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/compute-lv.sh b/tests/bugs/compute-lv.sh index e310cfb0..2be6b021 100755 --- a/tests/bugs/compute-lv.sh +++ b/tests/bugs/compute-lv.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/computebug.sh b/tests/bugs/computebug.sh index 24e7feda..e29fa29c 100755 --- a/tests/bugs/computebug.sh +++ b/tests/bugs/computebug.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/crosstabs-crash.sh b/tests/bugs/crosstabs-crash.sh index 18902db1..f77ce50b 100755 --- a/tests/bugs/crosstabs-crash.sh +++ b/tests/bugs/crosstabs-crash.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/crosstabs.sh b/tests/bugs/crosstabs.sh index 0125d7e7..902ed256 100755 --- a/tests/bugs/crosstabs.sh +++ b/tests/bugs/crosstabs.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/curtailed.sh b/tests/bugs/curtailed.sh index 7b060a58..05d77470 100755 --- a/tests/bugs/curtailed.sh +++ b/tests/bugs/curtailed.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/data-crash.sh b/tests/bugs/data-crash.sh index 66b67f76..1c55bca4 100755 --- a/tests/bugs/data-crash.sh +++ b/tests/bugs/data-crash.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/double-frequency.sh b/tests/bugs/double-frequency.sh index 77895ffe..c97521ba 100755 --- a/tests/bugs/double-frequency.sh +++ b/tests/bugs/double-frequency.sh @@ -18,6 +18,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/examine-1sample.sh b/tests/bugs/examine-1sample.sh index c34657b9..8e0ec7bd 100755 --- a/tests/bugs/examine-1sample.sh +++ b/tests/bugs/examine-1sample.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/get-no-file.sh b/tests/bugs/get-no-file.sh index 814e3228..b9da9fa1 100755 --- a/tests/bugs/get-no-file.sh +++ b/tests/bugs/get-no-file.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/get.sh b/tests/bugs/get.sh index 1a1bcb32..4fddea75 100755 --- a/tests/bugs/get.sh +++ b/tests/bugs/get.sh @@ -18,6 +18,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/html-frequency.sh b/tests/bugs/html-frequency.sh index 5d8c2bf0..e3df6fde 100755 --- a/tests/bugs/html-frequency.sh +++ b/tests/bugs/html-frequency.sh @@ -18,6 +18,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/if_crash.sh b/tests/bugs/if_crash.sh index fc3417b7..c2f37980 100755 --- a/tests/bugs/if_crash.sh +++ b/tests/bugs/if_crash.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/input-crash.sh b/tests/bugs/input-crash.sh index d7652881..16d15a00 100755 --- a/tests/bugs/input-crash.sh +++ b/tests/bugs/input-crash.sh @@ -21,6 +21,7 @@ cleanup() echo "NOT cleaning $TEMPDIR" return ; fi + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/lag_crash.sh b/tests/bugs/lag_crash.sh index 5636784d..09f6bc78 100755 --- a/tests/bugs/lag_crash.sh +++ b/tests/bugs/lag_crash.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/match-files-scratch.sh b/tests/bugs/match-files-scratch.sh index 9646b003..ce562c75 100755 --- a/tests/bugs/match-files-scratch.sh +++ b/tests/bugs/match-files-scratch.sh @@ -18,6 +18,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/multipass.sh b/tests/bugs/multipass.sh index 50161af6..524b7160 100755 --- a/tests/bugs/multipass.sh +++ b/tests/bugs/multipass.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/random.sh b/tests/bugs/random.sh index a2db6391..659b6935 100755 --- a/tests/bugs/random.sh +++ b/tests/bugs/random.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/recode-copy-bug.sh b/tests/bugs/recode-copy-bug.sh index 9fc88dea..1959831e 100755 --- a/tests/bugs/recode-copy-bug.sh +++ b/tests/bugs/recode-copy-bug.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/t-test-alpha.sh b/tests/bugs/t-test-alpha.sh index db8c5a1f..befc9eb9 100755 --- a/tests/bugs/t-test-alpha.sh +++ b/tests/bugs/t-test-alpha.sh @@ -18,6 +18,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/t-test-alpha2.sh b/tests/bugs/t-test-alpha2.sh index 74e1eb00..7ff29b2d 100755 --- a/tests/bugs/t-test-alpha2.sh +++ b/tests/bugs/t-test-alpha2.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/t-test-with-temp.sh b/tests/bugs/t-test-with-temp.sh index 520804d6..65b669e1 100755 --- a/tests/bugs/t-test-with-temp.sh +++ b/tests/bugs/t-test-with-temp.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/t-test.sh b/tests/bugs/t-test.sh index e2d0d12a..86cb7f10 100755 --- a/tests/bugs/t-test.sh +++ b/tests/bugs/t-test.sh @@ -18,6 +18,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/temp-freq.sh b/tests/bugs/temp-freq.sh index 537c5e0b..63ac638d 100755 --- a/tests/bugs/temp-freq.sh +++ b/tests/bugs/temp-freq.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/temporary.sh b/tests/bugs/temporary.sh index b0b4e3c3..7f7afb31 100755 --- a/tests/bugs/temporary.sh +++ b/tests/bugs/temporary.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/terminate.sh b/tests/bugs/terminate.sh index f96ba669..669a308d 100755 --- a/tests/bugs/terminate.sh +++ b/tests/bugs/terminate.sh @@ -19,6 +19,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/val-labs-trailing-slash.sh b/tests/bugs/val-labs-trailing-slash.sh index 88a17487..ac1e9def 100755 --- a/tests/bugs/val-labs-trailing-slash.sh +++ b/tests/bugs/val-labs-trailing-slash.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/bugs/val-labs.sh b/tests/bugs/val-labs.sh index e0597f46..719a6735 100755 --- a/tests/bugs/val-labs.sh +++ b/tests/bugs/val-labs.sh @@ -18,6 +18,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh index c6f48ae9..9c7f4c12 100755 --- a/tests/command/aggregate.sh +++ b/tests/command/aggregate.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/autorecod.sh b/tests/command/autorecod.sh index 6f3c8e15..d29a9577 100755 --- a/tests/command/autorecod.sh +++ b/tests/command/autorecod.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/beg-data.sh b/tests/command/beg-data.sh index 66ef60cc..846d936c 100755 --- a/tests/command/beg-data.sh +++ b/tests/command/beg-data.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/bignum.sh b/tests/command/bignum.sh index d69223e3..6ab82a86 100755 --- a/tests/command/bignum.sh +++ b/tests/command/bignum.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/count.sh b/tests/command/count.sh index 052acb3b..0b5b751e 100755 --- a/tests/command/count.sh +++ b/tests/command/count.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/data-list.sh b/tests/command/data-list.sh index bbcd589a..4206e498 100755 --- a/tests/command/data-list.sh +++ b/tests/command/data-list.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/erase.sh b/tests/command/erase.sh index 64d63a8e..1c010d8c 100755 --- a/tests/command/erase.sh +++ b/tests/command/erase.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/examine-extremes.sh b/tests/command/examine-extremes.sh index 55d6ca7b..b10fdbca 100755 --- a/tests/command/examine-extremes.sh +++ b/tests/command/examine-extremes.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/examine-percentiles.sh b/tests/command/examine-percentiles.sh index 37a33379..0d23b41f 100755 --- a/tests/command/examine-percentiles.sh +++ b/tests/command/examine-percentiles.sh @@ -18,6 +18,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/examine.sh b/tests/command/examine.sh index f8d3ccad..445e1dfc 100755 --- a/tests/command/examine.sh +++ b/tests/command/examine.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/file-label.sh b/tests/command/file-label.sh index 99a3f6fd..aaf404f4 100755 --- a/tests/command/file-label.sh +++ b/tests/command/file-label.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/filter.sh b/tests/command/filter.sh index 0745d932..4e955913 100755 --- a/tests/command/filter.sh +++ b/tests/command/filter.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/flip.sh b/tests/command/flip.sh index 2face721..60de8395 100755 --- a/tests/command/flip.sh +++ b/tests/command/flip.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/import-export.sh b/tests/command/import-export.sh index 41b8b13d..4476fa7d 100755 --- a/tests/command/import-export.sh +++ b/tests/command/import-export.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/lag.sh b/tests/command/lag.sh index e1a16993..579fd5af 100755 --- a/tests/command/lag.sh +++ b/tests/command/lag.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/list.sh b/tests/command/list.sh index 894b44f8..13801abc 100755 --- a/tests/command/list.sh +++ b/tests/command/list.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/longvars.sh b/tests/command/longvars.sh index 7a8a33f7..063ad6bb 100755 --- a/tests/command/longvars.sh +++ b/tests/command/longvars.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/loop.sh b/tests/command/loop.sh index 7cb5e2fb..f06f61a8 100755 --- a/tests/command/loop.sh +++ b/tests/command/loop.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/match-files.sh b/tests/command/match-files.sh index e3827383..ef2714bd 100755 --- a/tests/command/match-files.sh +++ b/tests/command/match-files.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR : } diff --git a/tests/command/no_case_size.sh b/tests/command/no_case_size.sh index 7f155b03..9e4ac240 100755 --- a/tests/command/no_case_size.sh +++ b/tests/command/no_case_size.sh @@ -22,6 +22,7 @@ cleanup() echo "NOT cleaning $TEMPDIR" return ; fi + cd / rm -rf $TEMPDIR } diff --git a/tests/command/oneway-missing.sh b/tests/command/oneway-missing.sh index 661a1c00..533a90a8 100755 --- a/tests/command/oneway-missing.sh +++ b/tests/command/oneway-missing.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/oneway-with-splits.sh b/tests/command/oneway-with-splits.sh index c3bd7038..333c66b3 100755 --- a/tests/command/oneway-with-splits.sh +++ b/tests/command/oneway-with-splits.sh @@ -21,6 +21,7 @@ cleanup() echo Not cleaning $TEMPDIR; return ; fi + cd / rm -rf $TEMPDIR } diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh index c8686090..91a72af6 100755 --- a/tests/command/oneway.sh +++ b/tests/command/oneway.sh @@ -20,6 +20,7 @@ cleanup() echo Not cleaning $TEMPDIR; return ; fi + cd / rm -rf $TEMPDIR } diff --git a/tests/command/permissions.sh b/tests/command/permissions.sh index 73f9325b..5283b209 100755 --- a/tests/command/permissions.sh +++ b/tests/command/permissions.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/print.sh b/tests/command/print.sh index 51e0d8eb..ca346023 100755 --- a/tests/command/print.sh +++ b/tests/command/print.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/rename.sh b/tests/command/rename.sh index 2295a121..c5d3ecfc 100755 --- a/tests/command/rename.sh +++ b/tests/command/rename.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/sample.sh b/tests/command/sample.sh index fc5641f2..39d1b8dc 100755 --- a/tests/command/sample.sh +++ b/tests/command/sample.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/sort.sh b/tests/command/sort.sh index c627967d..c619ca25 100755 --- a/tests/command/sort.sh +++ b/tests/command/sort.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } @@ -92,7 +93,7 @@ for count_repeat_buffers in \ repeat=$2 buffers=$3 - echo -n . + printf . activity="generate data for $count_repeat_buffers run" $PERL gen-data.pl $count $repeat > sort.data diff --git a/tests/command/split-file.sh b/tests/command/split-file.sh index 2c2d5737..f9ae79ab 100755 --- a/tests/command/split-file.sh +++ b/tests/command/split-file.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/sys-info.sh b/tests/command/sys-info.sh deleted file mode 100755 index ab5ab8d0..00000000 --- a/tests/command/sys-info.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh - -# This program tests the SYSFILE INFO command - -TEMPDIR=/tmp/pspp-tst-$$ -TESTFILE=$TEMPDIR/`basename $0`.sps - -here=`pwd`; - -# ensure that top_srcdir is absolute -cd $top_srcdir; top_srcdir=`pwd` - -STAT_CONFIG_PATH=$top_srcdir/config -export STAT_CONFIG_PATH - - -cleanup() -{ - 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 1" -cat > $TEMPDIR/save.stat << EOF -data list /x 1-2. -begin data. -3 -34 -2 -98 -end data. -save 'foo.save'. -display $JDATE. -finish. -EOF -if [ $? -ne 0 ] ; then no_result ; fi - -activity="run program 1" -$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/save.stat -if [ $? -ne 0 ] ; then no_result ; fi - -activity="create program 2" -cat > $TEMPDIR/read.stat << EOF -sysfile info file='foo.save'. - -finish. -EOF -if [ $? -ne 0 ] ; then no_result ; fi - -activity="run program 2" -$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/read.stat -if [ $? -ne 0 ] ; then no_result ; fi - - -activity="compare output" -diff -B -b $TEMPDIR/pspp.list - << EOF -1.1 SYSFILE INFO. -File: $TEMPDIR/foo.save -Label: No label. -Created: 18 Dec 03 09:05:20 by GNU pspp 0.3.1 - i686-pc-cygwin -Endian: Little. -Variables: 1 -Cases: 4 -Type: System File. -Weight: Not weighted. -Mode: Compression on. -+--------+-------------+---+ -|Variable|Description |Pos| -| | |iti| -| | |on | -#========#=============#===# -|X |Format: F2.0 | 1| -+--------+-------------+---+ -EOF -if [ $? -ne 0 ] ; then fail ; fi - - -pass; diff --git a/tests/command/sysfile-info.sh b/tests/command/sysfile-info.sh index ffa00c35..097a9c83 100755 --- a/tests/command/sysfile-info.sh +++ b/tests/command/sysfile-info.sh @@ -20,6 +20,7 @@ cleanup() echo "NOT cleaning $TEMPDIR" return ; fi + cd / rm -rf $TEMPDIR } diff --git a/tests/command/sysfiles-old.sh b/tests/command/sysfiles-old.sh index c842b339..85b915ad 100755 --- a/tests/command/sysfiles-old.sh +++ b/tests/command/sysfiles-old.sh @@ -18,6 +18,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/sysfiles.sh b/tests/command/sysfiles.sh index b504cdec..48f561bc 100755 --- a/tests/command/sysfiles.sh +++ b/tests/command/sysfiles.sh @@ -18,6 +18,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/t-test-1-indep-val.sh b/tests/command/t-test-1-indep-val.sh index ea4caff1..e149ac79 100755 --- a/tests/command/t-test-1-indep-val.sh +++ b/tests/command/t-test-1-indep-val.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/t-test-1-sample-missing-anal.sh b/tests/command/t-test-1-sample-missing-anal.sh index 9782386e..42101af2 100755 --- a/tests/command/t-test-1-sample-missing-anal.sh +++ b/tests/command/t-test-1-sample-missing-anal.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/t-test-1-sample-missing-list.sh b/tests/command/t-test-1-sample-missing-list.sh index e53adafd..7526ef9d 100755 --- a/tests/command/t-test-1-sample-missing-list.sh +++ b/tests/command/t-test-1-sample-missing-list.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/t-test-1s.sh b/tests/command/t-test-1s.sh index 2cc67c59..2e18365c 100755 --- a/tests/command/t-test-1s.sh +++ b/tests/command/t-test-1s.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/t-test-groups.sh b/tests/command/t-test-groups.sh index aedded1a..ca0cca45 100755 --- a/tests/command/t-test-groups.sh +++ b/tests/command/t-test-groups.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/t-test-indep-missing-anal.sh b/tests/command/t-test-indep-missing-anal.sh index fdcccda1..2f433108 100755 --- a/tests/command/t-test-indep-missing-anal.sh +++ b/tests/command/t-test-indep-missing-anal.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/t-test-indep-missing-list.sh b/tests/command/t-test-indep-missing-list.sh index 6e473d91..0deb1e31 100755 --- a/tests/command/t-test-indep-missing-list.sh +++ b/tests/command/t-test-indep-missing-list.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/t-test-paired-missing-anal.sh b/tests/command/t-test-paired-missing-anal.sh index 51415cc5..eb345401 100755 --- a/tests/command/t-test-paired-missing-anal.sh +++ b/tests/command/t-test-paired-missing-anal.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/t-test-paired-missing-list.sh b/tests/command/t-test-paired-missing-list.sh index d6623f7f..01e4fbea 100755 --- a/tests/command/t-test-paired-missing-list.sh +++ b/tests/command/t-test-paired-missing-list.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh index 3d7015f2..b3ef8415 100755 --- a/tests/command/t-test-pairs.sh +++ b/tests/command/t-test-pairs.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/tabs.sh b/tests/command/tabs.sh index 5f77f9c2..606c0a4c 100755 --- a/tests/command/tabs.sh +++ b/tests/command/tabs.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/trimmed-mean.sh b/tests/command/trimmed-mean.sh index 70b79918..a5d74e12 100755 --- a/tests/command/trimmed-mean.sh +++ b/tests/command/trimmed-mean.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/use.sh b/tests/command/use.sh index 95af52b0..bbbb7b44 100755 --- a/tests/command/use.sh +++ b/tests/command/use.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/command/weight.sh b/tests/command/weight.sh index 3793028d..d2840edd 100755 --- a/tests/command/weight.sh +++ b/tests/command/weight.sh @@ -17,6 +17,7 @@ export STAT_CONFIG_PATH cleanup() { if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then return ; fi + cd / rm -rf $TEMPDIR } diff --git a/tests/expressions/epoch.sh b/tests/expressions/epoch.sh index 7bfced01..914de328 100755 --- a/tests/expressions/epoch.sh +++ b/tests/expressions/epoch.sh @@ -15,6 +15,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/expressions/expressions.sh b/tests/expressions/expressions.sh index a2809880..f1ff5050 100755 --- a/tests/expressions/expressions.sh +++ b/tests/expressions/expressions.sh @@ -15,8 +15,8 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR - : } @@ -1298,7 +1298,6 @@ set mxerr 1000.' > $TEMPDIR/expr-opt.stat sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-opt.stat \ -e 's#^\(\(.*\); \)*\(.*\) => .*$#DEBUG EVALUATE\2/\3.#' if [ $? -ne 0 ] ; then no_result ; fi -cp $TEMPDIR/expr-opt.stat ~/foo activity="run optimizing program" $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii \ diff --git a/tests/expressions/randist.sh b/tests/expressions/randist.sh index 9c1ed925..8954338e 100755 --- a/tests/expressions/randist.sh +++ b/tests/expressions/randist.sh @@ -19,6 +19,7 @@ cleanup() echo NOT removing directory $TEMPDIR return ; fi + cd / rm -rf $TEMPDIR } diff --git a/tests/expressions/variables.sh b/tests/expressions/variables.sh index d67a9c4c..0d32df42 100755 --- a/tests/expressions/variables.sh +++ b/tests/expressions/variables.sh @@ -15,6 +15,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/expressions/vectors.sh b/tests/expressions/vectors.sh index 8dc563be..07f7c31b 100755 --- a/tests/expressions/vectors.sh +++ b/tests/expressions/vectors.sh @@ -15,6 +15,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/stats/descript-basic.sh b/tests/stats/descript-basic.sh index c86e0604..8ce119e0 100755 --- a/tests/stats/descript-basic.sh +++ b/tests/stats/descript-basic.sh @@ -15,6 +15,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/stats/descript-mean-bug.sh b/tests/stats/descript-mean-bug.sh index 8588c761..16c6d3ae 100755 --- a/tests/stats/descript-mean-bug.sh +++ b/tests/stats/descript-mean-bug.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/stats/descript-missing.sh b/tests/stats/descript-missing.sh index ae8bc5a0..77fa374c 100755 --- a/tests/stats/descript-missing.sh +++ b/tests/stats/descript-missing.sh @@ -15,6 +15,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } diff --git a/tests/stats/moments.sh b/tests/stats/moments.sh index 8c98bb63..0c6806ab 100755 --- a/tests/stats/moments.sh +++ b/tests/stats/moments.sh @@ -15,6 +15,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR : } diff --git a/tests/stats/ntiles.sh b/tests/stats/ntiles.sh index 7cea4f24..fb2ac6dc 100755 --- a/tests/stats/ntiles.sh +++ b/tests/stats/ntiles.sh @@ -15,6 +15,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR : } diff --git a/tests/stats/percentiles-compatible.sh b/tests/stats/percentiles-compatible.sh index c9858bdc..b3d997db 100755 --- a/tests/stats/percentiles-compatible.sh +++ b/tests/stats/percentiles-compatible.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR : } diff --git a/tests/stats/percentiles-enhanced.sh b/tests/stats/percentiles-enhanced.sh index 13b24c29..08383496 100755 --- a/tests/stats/percentiles-enhanced.sh +++ b/tests/stats/percentiles-enhanced.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR : } diff --git a/tests/xforms/casefile.sh b/tests/xforms/casefile.sh index a3a6df0e..f471dcff 100755 --- a/tests/xforms/casefile.sh +++ b/tests/xforms/casefile.sh @@ -15,6 +15,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR }