From 9aff19b717bcc242e16d04c34f348fd79ebdd685 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 26 Aug 2007 18:35:45 +0000 Subject: [PATCH] (main): When testing mode is enabled, use a built-in output driver configuration instead of reading it from the configuration file. Updated most invocations of PSPP in the tests to use --testing-mode and to avoid specifying an output format with -o (because --testing-mode implies -o raw-ascii). --- src/ui/terminal/ChangeLog | 9 +++++++-- src/ui/terminal/main.c | 9 ++++++++- tests/ChangeLog | 6 ++++++ tests/bugs/agg-crash-2.sh | 2 +- tests/bugs/agg_crash.sh | 2 +- tests/bugs/alpha-freq.sh | 2 +- tests/bugs/big-input-2.sh | 4 ++-- tests/bugs/big-input.sh | 2 +- tests/bugs/case-map.sh | 2 +- tests/bugs/comment-at-eof.sh | 2 +- tests/bugs/compression.sh | 2 +- tests/bugs/compute-fmt.sh | 2 +- tests/bugs/compute-lv.sh | 2 +- tests/bugs/compute-sum.sh | 2 +- tests/bugs/computebug.sh | 2 +- tests/bugs/crosstabs-crash.sh | 2 +- tests/bugs/crosstabs.sh | 2 +- tests/bugs/curtailed.sh | 2 +- tests/bugs/data-crash.sh | 2 +- tests/bugs/double-frequency.sh | 2 +- tests/bugs/empty-do-repeat.sh | 2 +- tests/bugs/examine-1sample.sh | 2 +- tests/bugs/examine-missing.sh | 2 +- tests/bugs/freq-nolabels.sh | 2 +- tests/bugs/get-no-file.sh | 2 +- tests/bugs/get.sh | 2 +- tests/bugs/if_crash.sh | 2 +- tests/bugs/input-crash.sh | 2 +- tests/bugs/keep-all.sh | 2 +- tests/bugs/lag_crash.sh | 2 +- tests/bugs/match-files-scratch.sh | 2 +- tests/bugs/multipass.sh | 2 +- tests/bugs/print-crash.sh | 2 +- tests/bugs/random.sh | 2 +- tests/bugs/recode-copy-bug.sh | 4 ++-- tests/bugs/signals.sh | 4 ++-- tests/bugs/t-test-alpha.sh | 2 +- tests/bugs/t-test-alpha2.sh | 2 +- tests/bugs/t-test-with-temp.sh | 2 +- tests/bugs/t-test.sh | 2 +- tests/bugs/temp-freq.sh | 2 +- tests/bugs/temporary.sh | 2 +- tests/bugs/val-labs-trailing-slash.sh | 2 +- tests/bugs/val-labs.sh | 2 +- tests/command/aggregate.sh | 2 +- tests/command/autorecod.sh | 2 +- tests/command/beg-data.sh | 2 +- tests/command/bignum.sh | 2 +- tests/command/count.sh | 4 ++-- tests/command/data-list.sh | 2 +- tests/command/do-repeat.sh | 2 +- tests/command/erase.sh | 4 ++-- tests/command/examine-extremes.sh | 2 +- tests/command/examine-percentiles.sh | 2 +- tests/command/examine.sh | 2 +- tests/command/file-handle.sh | 2 +- tests/command/file-label.sh | 2 +- tests/command/filter.sh | 2 +- tests/command/flip.sh | 2 +- tests/command/import-export.sh | 2 +- tests/command/lag.sh | 2 +- tests/command/list.sh | 2 +- tests/command/longvars.sh | 2 +- tests/command/loop.sh | 2 +- tests/command/match-files.sh | 6 +++--- tests/command/missing-values.sh | 2 +- tests/command/n_of_cases.sh | 2 +- tests/command/no_case_size.sh | 2 +- tests/command/npar-binomial.sh | 2 +- tests/command/npar-chisquare.sh | 8 ++++---- tests/command/oneway-missing.sh | 6 +++--- tests/command/oneway-with-splits.sh | 2 +- tests/command/oneway.sh | 2 +- tests/command/permissions.sh | 4 ++-- tests/command/print-strings.sh | 2 +- tests/command/print.sh | 2 +- tests/command/rank.sh | 8 ++++---- tests/command/regression.sh | 2 +- tests/command/rename.sh | 2 +- tests/command/sample.sh | 2 +- tests/command/sort.sh | 2 +- tests/command/split-file.sh | 2 +- tests/command/sysfile-info.sh | 2 +- tests/command/sysfiles-old.sh | 2 +- tests/command/sysfiles.sh | 2 +- tests/command/t-test-1-indep-val.sh | 2 +- tests/command/t-test-1-sample-missing-anal.sh | 4 ++-- tests/command/t-test-1-sample-missing-list.sh | 4 ++-- tests/command/t-test-1s.sh | 2 +- tests/command/t-test-groups.sh | 2 +- tests/command/t-test-indep-missing-anal.sh | 4 ++-- tests/command/t-test-indep-missing-list.sh | 4 ++-- tests/command/t-test-paired-missing-anal.sh | 4 ++-- tests/command/t-test-paired-missing-list.sh | 4 ++-- tests/command/t-test-pairs.sh | 2 +- tests/command/tabs.sh | 2 +- tests/command/trimmed-mean.sh | 2 +- tests/command/use.sh | 2 +- tests/command/vector.sh | 2 +- tests/command/very-long-strings.sh | 6 +++--- tests/command/weight.sh | 2 +- tests/expressions/expressions.sh | 8 ++++---- tests/expressions/randist.sh | 2 +- tests/expressions/valuelabel.sh | 2 +- tests/expressions/variables.sh | 2 +- tests/expressions/vectors.sh | 2 +- tests/formats/float-format.sh | 2 +- tests/stats/descript-basic.sh | 2 +- tests/stats/descript-mean-bug.sh | 2 +- tests/stats/descript-missing.sh | 2 +- tests/stats/moments.sh | 4 ++-- tests/stats/ntiles.sh | 4 ++-- tests/stats/percentiles-compatible.sh | 2 +- tests/stats/percentiles-enhanced.sh | 8 ++++---- tests/xforms/recode.sh | 2 +- 115 files changed, 165 insertions(+), 147 deletions(-) diff --git a/src/ui/terminal/ChangeLog b/src/ui/terminal/ChangeLog index b3063bd281..374bc52bf5 100644 --- a/src/ui/terminal/ChangeLog +++ b/src/ui/terminal/ChangeLog @@ -1,8 +1,13 @@ 2007-08-26 Ben Pfaff + Bug #17238. Thanks to John Darrington for review. + + * main.c (main): When testing mode is enabled, use a built-in + output driver configuration instead of reading it from the + configuration file. + * msg-ui.c (handle_msg): Send error message to non-screen output - devices also, if routing to listing files is enabled. Bug - #17238. Thanks to John Darrington for review. + devices also, if routing to listing files is enabled. 2007-08-23 Ben Pfaff diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 9143220d31..9375ffc629 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -112,7 +112,14 @@ main (int argc, char **argv) if (parse_command_line (argc, argv, the_source_stream)) { msg_ui_init (the_source_stream); - outp_read_devices (); + if (!get_testing_mode ()) + outp_read_devices (); + else + outp_configure_driver_line ( + ss_cstr ("raw-ascii:ascii:listing:width=9999 length=9999 " + "output-file=\"pspp.list\" emphasis=none " + "headers=off paginate=off squeeze=on " + "top-margin=0 bottom-margin=0")); the_lexer = lex_create (the_source_stream); for (;;) diff --git a/tests/ChangeLog b/tests/ChangeLog index 6c378de604..a51e779e19 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2007-08-26 Ben Pfaff + + * Updated most invocations of PSPP in the tests to use + --testing-mode and to avoid specifying an output format with -o + (because --testing-mode implies -o raw-ascii). + 2007-08-26 Ben Pfaff * command/aggregate.sh: Update output to include error messages, diff --git a/tests/bugs/agg-crash-2.sh b/tests/bugs/agg-crash-2.sh index 70db8cf607..cdb94cdc2d 100755 --- a/tests/bugs/agg-crash-2.sh +++ b/tests/bugs/agg-crash-2.sh @@ -70,7 +70,7 @@ LIST /x y. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list diff --git a/tests/bugs/agg_crash.sh b/tests/bugs/agg_crash.sh index 469cde7cf4..cc0bad23ce 100755 --- a/tests/bugs/agg_crash.sh +++ b/tests/bugs/agg_crash.sh @@ -72,7 +72,7 @@ if [ $? -ne 0 ] ; then no_result ; fi # So this will have a non zero error status. # But it shouldn't crash! activity="run_program" -$SUPERVISOR $PSPP -e /dev/null $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 1 ] ; then fail ; fi diff --git a/tests/bugs/alpha-freq.sh b/tests/bugs/alpha-freq.sh index 687993053e..49d9fe25a3 100755 --- a/tests/bugs/alpha-freq.sh +++ b/tests/bugs/alpha-freq.sh @@ -69,7 +69,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $PSPP $TEMPDIR/prog.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/bugs/big-input-2.sh b/tests/bugs/big-input-2.sh index 32b5bcfd3e..087e63a6f5 100755 --- a/tests/bugs/big-input-2.sh +++ b/tests/bugs/big-input-2.sh @@ -79,7 +79,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 0 ] ; then fail ; fi activity="appending to data" @@ -88,7 +88,7 @@ $PERL -e 'for ($i=0; $i<25000; $i++) { print "AB04\nAB12\n" };' >> $TEMPDIR/larg if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 0 ] ; then fail ; fi pass; diff --git a/tests/bugs/big-input.sh b/tests/bugs/big-input.sh index 10f31e2f60..9e133556a3 100755 --- a/tests/bugs/big-input.sh +++ b/tests/bugs/big-input.sh @@ -71,7 +71,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TEMPDIR/foo.sps +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TEMPDIR/foo.sps if [ $? -ne 0 ] ; then fail ; fi pass; diff --git a/tests/bugs/case-map.sh b/tests/bugs/case-map.sh index 479aea9c80..acc19dcfc3 100755 --- a/tests/bugs/case-map.sh +++ b/tests/bugs/case-map.sh @@ -68,7 +68,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TEMPDIR/foo.sps +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TEMPDIR/foo.sps if [ $? -ne 0 ] ; then fail ; fi pass; diff --git a/tests/bugs/comment-at-eof.sh b/tests/bugs/comment-at-eof.sh index 617659b34e..6383474823 100755 --- a/tests/bugs/comment-at-eof.sh +++ b/tests/bugs/comment-at-eof.sh @@ -59,7 +59,7 @@ COMMENT this is a comment at end of file. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/foo.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/foo.sps if [ $? -ne 0 ] ; then fail; fi pass; diff --git a/tests/bugs/compression.sh b/tests/bugs/compression.sh index 5b7178d28a..138b6ca5c3 100755 --- a/tests/bugs/compression.sh +++ b/tests/bugs/compression.sh @@ -72,7 +72,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then fail ; fi # Make sure the file really was compressed diff --git a/tests/bugs/compute-fmt.sh b/tests/bugs/compute-fmt.sh index ea860281fb..2626b59521 100755 --- a/tests/bugs/compute-fmt.sh +++ b/tests/bugs/compute-fmt.sh @@ -66,7 +66,7 @@ SAVE outfile='$TEMPDIR/temp.sav'. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/foo.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/foo.sps if [ $? -ne 0 ] ; then fail; fi diff --git a/tests/bugs/compute-lv.sh b/tests/bugs/compute-lv.sh index 784fe04694..8b7f7fd18c 100755 --- a/tests/bugs/compute-lv.sh +++ b/tests/bugs/compute-lv.sh @@ -70,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run prog" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/bugs/compute-sum.sh b/tests/bugs/compute-sum.sh index 4b043a9215..846ef79e58 100755 --- a/tests/bugs/compute-sum.sh +++ b/tests/bugs/compute-sum.sh @@ -68,7 +68,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP $TEMPDIR/compute-sum.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/compute-sum.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/bugs/computebug.sh b/tests/bugs/computebug.sh index cf9e456554..08077e57a8 100755 --- a/tests/bugs/computebug.sh +++ b/tests/bugs/computebug.sh @@ -60,7 +60,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/computebug.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/computebug.stat if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/crosstabs-crash.sh b/tests/bugs/crosstabs-crash.sh index 51cc23f59b..0531094a13 100755 --- a/tests/bugs/crosstabs-crash.sh +++ b/tests/bugs/crosstabs-crash.sh @@ -66,7 +66,7 @@ CROSSTABS VARIABLES X (1,7) Y (1,7) /TABLES X BY Y. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/crosstabs.sh b/tests/bugs/crosstabs.sh index b4eb3dbec8..818682d730 100755 --- a/tests/bugs/crosstabs.sh +++ b/tests/bugs/crosstabs.sh @@ -80,7 +80,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $PSPP $TEMPDIR/ct.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/ct.stat if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/bugs/curtailed.sh b/tests/bugs/curtailed.sh index 86acddf5c9..9c46e9ffcd 100755 --- a/tests/bugs/curtailed.sh +++ b/tests/bugs/curtailed.sh @@ -70,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi #This must fail activity="run program" -$SUPERVISOR $PSPP -e /dev/null $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 1 ] ; then fail ; fi diff --git a/tests/bugs/data-crash.sh b/tests/bugs/data-crash.sh index dd86502847..1cf5d79450 100755 --- a/tests/bugs/data-crash.sh +++ b/tests/bugs/data-crash.sh @@ -63,7 +63,7 @@ if [ $? -ne 0 ] ; then no_result ; fi #This must fail activity="run program" -$SUPERVISOR $PSPP -e /dev/null $TEMPDIR/ct.stat +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TEMPDIR/ct.stat if [ $? -ne 1 ] ; then fail ; fi pass; diff --git a/tests/bugs/double-frequency.sh b/tests/bugs/double-frequency.sh index b6e6a50f9a..1c9405e876 100755 --- a/tests/bugs/double-frequency.sh +++ b/tests/bugs/double-frequency.sh @@ -73,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi cd $TEMPDIR activity="run data" -$SUPERVISOR $PSPP $TEMPDIR/ff.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/ff.stat if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/bugs/empty-do-repeat.sh b/tests/bugs/empty-do-repeat.sh index ad82c23341..9829230d09 100755 --- a/tests/bugs/empty-do-repeat.sh +++ b/tests/bugs/empty-do-repeat.sh @@ -67,7 +67,7 @@ if [ $? -ne 0 ] ; then no_result ; fi # Must not crash. activity="run program" -$SUPERVISOR $PSPP $TEMPDIR/repeat.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/repeat.stat if [ $? -ne 0 ] ; then fail ; fi pass; diff --git a/tests/bugs/examine-1sample.sh b/tests/bugs/examine-1sample.sh index 00a6ce29b2..8fe628f545 100755 --- a/tests/bugs/examine-1sample.sh +++ b/tests/bugs/examine-1sample.sh @@ -69,7 +69,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then fail ; fi pass diff --git a/tests/bugs/examine-missing.sh b/tests/bugs/examine-missing.sh index 78b6be5f2f..a2e79cecf7 100755 --- a/tests/bugs/examine-missing.sh +++ b/tests/bugs/examine-missing.sh @@ -70,7 +70,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TESTFILE 2> /dev/null +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE 2> /dev/null if [ $? -ne 0 ] ; then fail ; fi pass; diff --git a/tests/bugs/freq-nolabels.sh b/tests/bugs/freq-nolabels.sh index 0076b8cbdb..68bbd425d2 100755 --- a/tests/bugs/freq-nolabels.sh +++ b/tests/bugs/freq-nolabels.sh @@ -76,7 +76,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/get-no-file.sh b/tests/bugs/get-no-file.sh index 45b688276c..5e4de67a7f 100755 --- a/tests/bugs/get-no-file.sh +++ b/tests/bugs/get-no-file.sh @@ -64,7 +64,7 @@ if [ $? -ne 0 ] ; then no_result ; fi # We use the stdinput here, because the bug seems to manifest itself only in # interactive mode. activity="run program" -cat $TESTFILE | $SUPERVISOR $PSPP --testing-mode -o raw-ascii > /dev/null +cat $TESTFILE | $SUPERVISOR $PSPP --testing-mode > /dev/null if [ $? -ne 0 ] ; then fail ; fi pass diff --git a/tests/bugs/get.sh b/tests/bugs/get.sh index 024da3f122..1ab18044b3 100755 --- a/tests/bugs/get.sh +++ b/tests/bugs/get.sh @@ -83,7 +83,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/if_crash.sh b/tests/bugs/if_crash.sh index ef059e955b..bda4a73c6c 100755 --- a/tests/bugs/if_crash.sh +++ b/tests/bugs/if_crash.sh @@ -76,7 +76,7 @@ if [ $? -ne 0 ] ; then no_result ; fi # So this will have a non zero error status. # But it shouldn't crash! activity="run_program" -$SUPERVISOR $PSPP -e /dev/null $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 1 ] ; then fail ; fi diff --git a/tests/bugs/input-crash.sh b/tests/bugs/input-crash.sh index 2336c867e5..f67b3d28a4 100755 --- a/tests/bugs/input-crash.sh +++ b/tests/bugs/input-crash.sh @@ -73,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi # The above syntax is invalid, so this program should fail to parse activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 1 ] ; then fail ; fi diff --git a/tests/bugs/keep-all.sh b/tests/bugs/keep-all.sh index bd3deca86b..1450889ffb 100755 --- a/tests/bugs/keep-all.sh +++ b/tests/bugs/keep-all.sh @@ -69,7 +69,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run PSPP ($mode)" - $SUPERVISOR $PSPP -o raw-ascii $TESTFILE + $SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/lag_crash.sh b/tests/bugs/lag_crash.sh index ae3c3748a3..87a411ad0d 100755 --- a/tests/bugs/lag_crash.sh +++ b/tests/bugs/lag_crash.sh @@ -70,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run_program" -$SUPERVISOR $PSPP $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/bugs/match-files-scratch.sh b/tests/bugs/match-files-scratch.sh index e526cd51ec..4830ddd359 100755 --- a/tests/bugs/match-files-scratch.sh +++ b/tests/bugs/match-files-scratch.sh @@ -74,7 +74,7 @@ FINISH. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/multipass.sh b/tests/bugs/multipass.sh index 3e0b133943..24b3a5ed8c 100755 --- a/tests/bugs/multipass.sh +++ b/tests/bugs/multipass.sh @@ -74,7 +74,7 @@ DESCRIPTIVES EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/print-crash.sh b/tests/bugs/print-crash.sh index ba1630f5b6..9c1a7677f9 100755 --- a/tests/bugs/print-crash.sh +++ b/tests/bugs/print-crash.sh @@ -68,7 +68,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 1 ] ; then fail ; fi diff --git a/tests/bugs/random.sh b/tests/bugs/random.sh index c7f3e8bee7..c41dbf0050 100755 --- a/tests/bugs/random.sh +++ b/tests/bugs/random.sh @@ -71,7 +71,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/recode-copy-bug.sh b/tests/bugs/recode-copy-bug.sh index 7f838d61d2..9ba32baa46 100755 --- a/tests/bugs/recode-copy-bug.sh +++ b/tests/bugs/recode-copy-bug.sh @@ -64,7 +64,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/recode-copy-bug-1.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/recode-copy-bug-1.stat if [ $? -ne 0 ] ; then no_result ; fi @@ -75,7 +75,7 @@ if [ $? -ne 0 ] ; then fail ; fi activity="run program 2" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/recode-copy-bug-2.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/recode-copy-bug-2.stat if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/signals.sh b/tests/bugs/signals.sh index 3c2cf941e8..a2787f29c8 100755 --- a/tests/bugs/signals.sh +++ b/tests/bugs/signals.sh @@ -58,7 +58,7 @@ mkdir -p $TEMPDIR cd $TEMPDIR activity="sending SIGINT to pspp" -echo 'host kill -INT $PPID' | $PSPP --testing-mode -o raw-ascii > /dev/null 2> $TEMPDIR/stderr1 +echo 'host kill -INT $PPID' | $PSPP --testing-mode > /dev/null 2> $TEMPDIR/stderr1 if [ $? -ne 0 ] ; then no_result ; fi # SIGINT should have caused a clean shutdown @@ -67,7 +67,7 @@ activity="checking for absence of error messages 1" if [ $? -ne 0 ] ; then fail ; fi activity="sending SIGSEGV to pspp" -echo 'host kill -SEGV $PPID' | $PSPP --testing-mode -o raw-ascii > /dev/null 2> $TEMPDIR/stderr2 +echo 'host kill -SEGV $PPID' | $PSPP --testing-mode > /dev/null 2> $TEMPDIR/stderr2 if [ $? -eq 0 ] ; then no_result ; fi # SIGSEGV should have caused an error message diff --git a/tests/bugs/t-test-alpha.sh b/tests/bugs/t-test-alpha.sh index 8cffe34cb4..f002d61f67 100755 --- a/tests/bugs/t-test-alpha.sh +++ b/tests/bugs/t-test-alpha.sh @@ -78,7 +78,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/bugs/t-test-alpha2.sh b/tests/bugs/t-test-alpha2.sh index 9568707f2e..b1450d182f 100755 --- a/tests/bugs/t-test-alpha2.sh +++ b/tests/bugs/t-test-alpha2.sh @@ -77,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null +$SUPERVISOR $PSPP --testing-mode $TESTFILE > /dev/null #invert v if [ $? -eq 0 ] ; then fail ; fi diff --git a/tests/bugs/t-test-with-temp.sh b/tests/bugs/t-test-with-temp.sh index e4bc0af4cd..7882d8a587 100755 --- a/tests/bugs/t-test-with-temp.sh +++ b/tests/bugs/t-test-with-temp.sh @@ -71,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" diff --git a/tests/bugs/t-test.sh b/tests/bugs/t-test.sh index 9fac7dfc8b..6386ac2c99 100755 --- a/tests/bugs/t-test.sh +++ b/tests/bugs/t-test.sh @@ -73,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi #The syntax was invalid. Therefore pspp must return non zero. activity="run program" -$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 1 ] ; then fail ; fi pass; diff --git a/tests/bugs/temp-freq.sh b/tests/bugs/temp-freq.sh index 7ec3c012a4..64f12ee9aa 100755 --- a/tests/bugs/temp-freq.sh +++ b/tests/bugs/temp-freq.sh @@ -79,7 +79,7 @@ FINISH EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list diff --git a/tests/bugs/temporary.sh b/tests/bugs/temporary.sh index 5aed6fde34..d2091669a9 100755 --- a/tests/bugs/temporary.sh +++ b/tests/bugs/temporary.sh @@ -76,7 +76,7 @@ list. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/val-labs-trailing-slash.sh b/tests/bugs/val-labs-trailing-slash.sh index 30c875ff65..a014aa7feb 100755 --- a/tests/bugs/val-labs-trailing-slash.sh +++ b/tests/bugs/val-labs-trailing-slash.sh @@ -73,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then fail ; fi pass diff --git a/tests/bugs/val-labs.sh b/tests/bugs/val-labs.sh index b27683b6c2..c287bde804 100755 --- a/tests/bugs/val-labs.sh +++ b/tests/bugs/val-labs.sh @@ -73,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi #Invalid syntax --- return value is non zero. activity="run program" -$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 1 ] ; then fail ; fi pass; diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh index b95401818a..8fca96fab0 100755 --- a/tests/command/aggregate.sh +++ b/tests/command/aggregate.sh @@ -214,7 +214,7 @@ for outfile in scratch active external; do if [ $? -ne 0 ] ; then no_result ; fi activity="run $name.pspp" - $SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $name.pspp + $SUPERVISOR $PSPP --testing-mode -e /dev/null $name.pspp if [ $? -ne 0 ] ; then no_result ; fi activity="check $name output" diff --git a/tests/command/autorecod.sh b/tests/command/autorecod.sh index 57b2dc825f..47e00239ac 100755 --- a/tests/command/autorecod.sh +++ b/tests/command/autorecod.sh @@ -83,7 +83,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="test output" diff --git a/tests/command/beg-data.sh b/tests/command/beg-data.sh index 35f937b51c..9071a47536 100755 --- a/tests/command/beg-data.sh +++ b/tests/command/beg-data.sh @@ -82,7 +82,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare data" diff --git a/tests/command/bignum.sh b/tests/command/bignum.sh index fa6e31a4bc..e508191814 100755 --- a/tests/command/bignum.sh +++ b/tests/command/bignum.sh @@ -134,7 +134,7 @@ foobar if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi # Like the above comments say ... diff --git a/tests/command/count.sh b/tests/command/count.sh index 7fa56cc4ba..7c70fa2113 100755 --- a/tests/command/count.sh +++ b/tests/command/count.sh @@ -76,7 +76,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="Run pspp 1" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi @@ -124,7 +124,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="Run pspp 2" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/data-list.sh b/tests/command/data-list.sh index 01a682c1e9..fbad9c80d5 100755 --- a/tests/command/data-list.sh +++ b/tests/command/data-list.sh @@ -143,7 +143,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii --testing-mode $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then fail ; fi activity="compare output" diff --git a/tests/command/do-repeat.sh b/tests/command/do-repeat.sh index 62000de630..3f37618a65 100755 --- a/tests/command/do-repeat.sh +++ b/tests/command/do-repeat.sh @@ -80,7 +80,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare results" diff --git a/tests/command/erase.sh b/tests/command/erase.sh index bbb094e14e..c16ed3dc72 100755 --- a/tests/command/erase.sh +++ b/tests/command/erase.sh @@ -77,7 +77,7 @@ if [ ! -f $TEMPDIR/foobar ] ; then fail ; fi # This command must fail activity="run prog 1" -$SUPERVISOR $PSPP -e /dev/null $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -eq 0 ] ; then fail ; fi @@ -91,7 +91,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run prog 1" -$SUPERVISOR $PSPP $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then fail ; fi # foobar should now be gone diff --git a/tests/command/examine-extremes.sh b/tests/command/examine-extremes.sh index 982a03bc32..feb052c430 100755 --- a/tests/command/examine-extremes.sh +++ b/tests/command/examine-extremes.sh @@ -91,7 +91,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare results" diff --git a/tests/command/examine-percentiles.sh b/tests/command/examine-percentiles.sh index a1bb62ef49..8638d1ade6 100755 --- a/tests/command/examine-percentiles.sh +++ b/tests/command/examine-percentiles.sh @@ -84,7 +84,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/examine.sh b/tests/command/examine.sh index 7c1f394221..4f710f5bb8 100755 --- a/tests/command/examine.sh +++ b/tests/command/examine.sh @@ -94,7 +94,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi # NOTE: In the following data: Only the extreme values have been checked diff --git a/tests/command/file-handle.sh b/tests/command/file-handle.sh index 14596edbd5..b41c5a5405 100755 --- a/tests/command/file-handle.sh +++ b/tests/command/file-handle.sh @@ -72,7 +72,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/file-label.sh b/tests/command/file-label.sh index 48d8739bf6..4b6ab0e622 100755 --- a/tests/command/file-label.sh +++ b/tests/command/file-label.sh @@ -115,7 +115,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi # We need to filter out the dates/times diff --git a/tests/command/filter.sh b/tests/command/filter.sh index cf685ba97d..40729c85ed 100755 --- a/tests/command/filter.sh +++ b/tests/command/filter.sh @@ -82,7 +82,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/flip.sh b/tests/command/flip.sh index cfafa9612c..dc2b177014 100755 --- a/tests/command/flip.sh +++ b/tests/command/flip.sh @@ -88,7 +88,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/flip.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/flip.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/import-export.sh b/tests/command/import-export.sh index 8b88937f90..67fc8d2ab7 100755 --- a/tests/command/import-export.sh +++ b/tests/command/import-export.sh @@ -70,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/lag.sh b/tests/command/lag.sh index 4221fb7b88..68f4f9c793 100755 --- a/tests/command/lag.sh +++ b/tests/command/lag.sh @@ -73,7 +73,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/lag.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/lag.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare result" diff --git a/tests/command/list.sh b/tests/command/list.sh index a11ea78dd6..ab95a0b35f 100755 --- a/tests/command/list.sh +++ b/tests/command/list.sh @@ -74,7 +74,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/longvars.sh b/tests/command/longvars.sh index 5baa5fd40c..184be56520 100755 --- a/tests/command/longvars.sh +++ b/tests/command/longvars.sh @@ -73,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/loop.sh b/tests/command/loop.sh index 2b1383fe2e..d8f930c8b5 100755 --- a/tests/command/loop.sh +++ b/tests/command/loop.sh @@ -127,7 +127,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e $TEMPDIR/stdout $TEMPDIR/loop.stat +$SUPERVISOR $PSPP --testing-mode -e $TEMPDIR/stdout $TEMPDIR/loop.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare stdout" diff --git a/tests/command/match-files.sh b/tests/command/match-files.sh index 28b9674609..bb4107e58f 100755 --- a/tests/command/match-files.sh +++ b/tests/command/match-files.sh @@ -168,7 +168,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run $name.pspp" - $SUPERVISOR $PSPP -o raw-ascii -e /dev/null $name.pspp + $SUPERVISOR $PSPP --testing-mode -e /dev/null $name.pspp if [ $? -ne 0 ] ; then no_result ; fi activity="check $name output" @@ -193,7 +193,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run $name.pspp" -$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $name.pspp +$SUPERVISOR $PSPP --testing-mode -e /dev/null $name.pspp if [ $? -ne 0 ] ; then no_result ; fi activity="check $name output" @@ -242,7 +242,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run $name.pspp" -$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $name.pspp +$SUPERVISOR $PSPP --testing-mode -e /dev/null $name.pspp if [ $? -ne 0 ] ; then no_result ; fi activity="check $name output" diff --git a/tests/command/missing-values.sh b/tests/command/missing-values.sh index 4936736d1e..4b1e0eb4e7 100755 --- a/tests/command/missing-values.sh +++ b/tests/command/missing-values.sh @@ -111,7 +111,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii --testing-mode --error-file=$TEMPDIR/errs $TEMPDIR/missing-values.stat +$SUPERVISOR $PSPP --testing-mode --error-file=$TEMPDIR/errs $TEMPDIR/missing-values.stat # Note vv --- there are errors in input. Therefore, the command must FAIL if [ $? -eq 0 ] ; then fail ; fi diff --git a/tests/command/n_of_cases.sh b/tests/command/n_of_cases.sh index 472a345734..7c97e4458a 100755 --- a/tests/command/n_of_cases.sh +++ b/tests/command/n_of_cases.sh @@ -75,7 +75,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/no_case_size.sh b/tests/command/no_case_size.sh index e3fc2774d4..0c94051a1e 100755 --- a/tests/command/no_case_size.sh +++ b/tests/command/no_case_size.sh @@ -68,7 +68,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/npar-binomial.sh b/tests/command/npar-binomial.sh index 6fc35117cb..8c9a997136 100755 --- a/tests/command/npar-binomial.sh +++ b/tests/command/npar-binomial.sh @@ -212,7 +212,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output 1" diff --git a/tests/command/npar-chisquare.sh b/tests/command/npar-chisquare.sh index 5a1b8af179..7ac52d0366 100755 --- a/tests/command/npar-chisquare.sh +++ b/tests/command/npar-chisquare.sh @@ -91,7 +91,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output 1" @@ -192,7 +192,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE > $TEMPDIR/output +$SUPERVISOR $PSPP --testing-mode $TESTFILE > $TEMPDIR/output if [ $? -eq 0 ] ; then no_result ; fi activity="compare errors 2" @@ -231,7 +231,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 3" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi @@ -302,7 +302,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 4" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/oneway-missing.sh b/tests/command/oneway-missing.sh index 989f8566d6..ec3634ca70 100755 --- a/tests/command/oneway-missing.sh +++ b/tests/command/oneway-missing.sh @@ -84,7 +84,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -122,7 +122,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare outputs" @@ -162,7 +162,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 3" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare outputs" diff --git a/tests/command/oneway-with-splits.sh b/tests/command/oneway-with-splits.sh index 33cacd121e..7197a096f8 100755 --- a/tests/command/oneway-with-splits.sh +++ b/tests/command/oneway-with-splits.sh @@ -96,7 +96,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh index c0d8dc3327..c5f251c136 100755 --- a/tests/command/oneway.sh +++ b/tests/command/oneway.sh @@ -93,7 +93,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list diff --git a/tests/command/permissions.sh b/tests/command/permissions.sh index 2c6005ad25..359efa1006 100755 --- a/tests/command/permissions.sh +++ b/tests/command/permissions.sh @@ -66,7 +66,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/per.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/per.sps if [ $? -ne 0 ] ; then no_result ; fi activity="Check Permissions" @@ -82,7 +82,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/per.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/per.sps if [ $? -ne 0 ] ; then no_result ; fi activity="Check Permissions" diff --git a/tests/command/print-strings.sh b/tests/command/print-strings.sh index 383d0e7248..114794f278 100755 --- a/tests/command/print-strings.sh +++ b/tests/command/print-strings.sh @@ -77,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/print.sh b/tests/command/print.sh index 8d7a6160a1..c5de1e9fe6 100755 --- a/tests/command/print.sh +++ b/tests/command/print.sh @@ -101,7 +101,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii --testing-mode --error-file=$TEMPDIR/errs $TEMPDIR/print.stat +$SUPERVISOR $PSPP --testing-mode --error-file=$TEMPDIR/errs $TEMPDIR/print.stat if [ $? -ne 0 ] ; then fail ; fi activity="compare print.out" diff --git a/tests/command/rank.sh b/tests/command/rank.sh index 6b8760e6e2..03f000a93a 100755 --- a/tests/command/rank.sh +++ b/tests/command/rank.sh @@ -81,7 +81,7 @@ if [ $? -ne 0 ] ; then no_result ; fi # Check that it properly handles failed transformations. activity="run program 1" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e $TEMPDIR/err $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e $TEMPDIR/err $TESTFILE if [ $? -ne 1 ] ; then fail ; fi activity="diff 1" @@ -130,7 +130,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program (syntax errors)" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e $TEMPDIR/errs $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e $TEMPDIR/errs $TESTFILE if [ $? -ne 1 ] ; then fail ; fi activity="compare errors" @@ -358,7 +358,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 3" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi @@ -580,7 +580,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 4" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/command/regression.sh b/tests/command/regression.sh index 0fe9429872..ddb78e1a31 100755 --- a/tests/command/regression.sh +++ b/tests/command/regression.sh @@ -77,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list diff --git a/tests/command/rename.sh b/tests/command/rename.sh index 6eae4a5250..2837223ed6 100755 --- a/tests/command/rename.sh +++ b/tests/command/rename.sh @@ -76,7 +76,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="check sysfile" diff --git a/tests/command/sample.sh b/tests/command/sample.sh index 8a210d0263..6ba6646bc1 100755 --- a/tests/command/sample.sh +++ b/tests/command/sample.sh @@ -77,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii --testing-mode $TEMPDIR/sample.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/sample.stat if [ $? -ne 0 ] ; then no_result ; fi activity="create head" diff --git a/tests/command/sort.sh b/tests/command/sort.sh index 1eb4d855ae..00d4f403c3 100755 --- a/tests/command/sort.sh +++ b/tests/command/sort.sh @@ -116,7 +116,7 @@ for count_repeat_buffers in \ } > sort.pspp || no_result activity="run program" - $SUPERVISOR $PSPP --testing-mode -o raw-ascii sort.pspp + $SUPERVISOR $PSPP --testing-mode sort.pspp if [ $? -ne 0 ] ; then no_result ; fi perl -pi -e 's/^\s*$//g' sort.exp sort.out diff --git a/tests/command/split-file.sh b/tests/command/split-file.sh index 10e34ed9e2..60b4d3a557 100755 --- a/tests/command/split-file.sh +++ b/tests/command/split-file.sh @@ -81,7 +81,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/split.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/split.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare results" diff --git a/tests/command/sysfile-info.sh b/tests/command/sysfile-info.sh index 73e981e132..f741ff85f1 100755 --- a/tests/command/sysfile-info.sh +++ b/tests/command/sysfile-info.sh @@ -74,7 +74,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="filter output" diff --git a/tests/command/sysfiles-old.sh b/tests/command/sysfiles-old.sh index 81ef556cfc..4b2c8cd40d 100755 --- a/tests/command/sysfiles-old.sh +++ b/tests/command/sysfiles-old.sh @@ -80,7 +80,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="check file exists" diff --git a/tests/command/sysfiles.sh b/tests/command/sysfiles.sh index 7e0dcafcaf..2bfd6a5b03 100755 --- a/tests/command/sysfiles.sh +++ b/tests/command/sysfiles.sh @@ -79,7 +79,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/t-test-1-indep-val.sh b/tests/command/t-test-1-indep-val.sh index 375167ccf3..2490490130 100755 --- a/tests/command/t-test-1-indep-val.sh +++ b/tests/command/t-test-1-indep-val.sh @@ -86,7 +86,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/t-test-1-sample-missing-anal.sh b/tests/command/t-test-1-sample-missing-anal.sh index dcbc2eeed9..51ec1dc132 100755 --- a/tests/command/t-test-1-sample-missing-anal.sh +++ b/tests/command/t-test-1-sample-missing-anal.sh @@ -71,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -97,7 +97,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare outputs" diff --git a/tests/command/t-test-1-sample-missing-list.sh b/tests/command/t-test-1-sample-missing-list.sh index 12865181bf..8d63a3e20d 100755 --- a/tests/command/t-test-1-sample-missing-list.sh +++ b/tests/command/t-test-1-sample-missing-list.sh @@ -70,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -97,7 +97,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare outputs" diff --git a/tests/command/t-test-1s.sh b/tests/command/t-test-1s.sh index a24bb174cc..bf421bd45d 100755 --- a/tests/command/t-test-1s.sh +++ b/tests/command/t-test-1s.sh @@ -70,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/t-test-groups.sh b/tests/command/t-test-groups.sh index 97963226f2..05cc1835fe 100755 --- a/tests/command/t-test-groups.sh +++ b/tests/command/t-test-groups.sh @@ -77,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/t-test-indep-missing-anal.sh b/tests/command/t-test-indep-missing-anal.sh index 6719faf851..181c73b6bd 100755 --- a/tests/command/t-test-indep-missing-anal.sh +++ b/tests/command/t-test-indep-missing-anal.sh @@ -70,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -98,7 +98,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/t-test-indep-missing-list.sh b/tests/command/t-test-indep-missing-list.sh index ec97144d22..2c7114f1bf 100755 --- a/tests/command/t-test-indep-missing-list.sh +++ b/tests/command/t-test-indep-missing-list.sh @@ -71,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -96,7 +96,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/t-test-paired-missing-anal.sh b/tests/command/t-test-paired-missing-anal.sh index b0d346470b..533dfa4930 100755 --- a/tests/command/t-test-paired-missing-anal.sh +++ b/tests/command/t-test-paired-missing-anal.sh @@ -70,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -96,7 +96,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/t-test-paired-missing-list.sh b/tests/command/t-test-paired-missing-list.sh index d26fe3044c..4317a574a7 100755 --- a/tests/command/t-test-paired-missing-list.sh +++ b/tests/command/t-test-paired-missing-list.sh @@ -70,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -96,7 +96,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh index a228cffbdb..f657e8fb2c 100755 --- a/tests/command/t-test-pairs.sh +++ b/tests/command/t-test-pairs.sh @@ -69,7 +69,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/tabs.sh b/tests/command/tabs.sh index d93fd17897..c6d968b188 100755 --- a/tests/command/tabs.sh +++ b/tests/command/tabs.sh @@ -74,7 +74,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/tabs.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/tabs.stat if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/trimmed-mean.sh b/tests/command/trimmed-mean.sh index ea30f8f56c..7346e526cf 100755 --- a/tests/command/trimmed-mean.sh +++ b/tests/command/trimmed-mean.sh @@ -77,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/use.sh b/tests/command/use.sh index 65532f44f5..f81b226412 100755 --- a/tests/command/use.sh +++ b/tests/command/use.sh @@ -75,7 +75,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -B $STAT_CONFIG_PATH --testing-mode -o raw-ascii $TEMPDIR/filter.stat +$SUPERVISOR $PSPP -B $STAT_CONFIG_PATH --testing-mode $TEMPDIR/filter.stat if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/vector.sh b/tests/command/vector.sh index 9e5045bf7e..94c0c4693c 100755 --- a/tests/command/vector.sh +++ b/tests/command/vector.sh @@ -80,7 +80,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e $TEMPDIR/stdout $TEMPDIR/vector.stat +$SUPERVISOR $PSPP --testing-mode -e $TEMPDIR/stdout $TEMPDIR/vector.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare stdout" diff --git a/tests/command/very-long-strings.sh b/tests/command/very-long-strings.sh index 7489915e91..d6c8042047 100755 --- a/tests/command/very-long-strings.sh +++ b/tests/command/very-long-strings.sh @@ -71,7 +71,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 0" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $TESTFILE +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 0 ] ; then fail ; fi activity="compare variable display 0" @@ -162,7 +162,7 @@ EOF activity="run program 1 ($options)" - $SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE + $SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="Create file2 ($options)" @@ -183,7 +183,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2 ($options)" - $SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE + $SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/weight.sh b/tests/command/weight.sh index 82d65e795c..01bd0a318c 100755 --- a/tests/command/weight.sh +++ b/tests/command/weight.sh @@ -69,7 +69,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare results" diff --git a/tests/expressions/expressions.sh b/tests/expressions/expressions.sh index c87148946b..8f55efda37 100755 --- a/tests/expressions/expressions.sh +++ b/tests/expressions/expressions.sh @@ -1561,7 +1561,7 @@ sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-opt.stat \ if [ $? -ne 0 ] ; then no_result ; fi activity="run optimizing program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode \ $TEMPDIR/expr-opt.stat >$TEMPDIR/expr-opt.err 2> $TEMPDIR/expr-opt.out activity="compare optimizing output" @@ -1577,7 +1577,7 @@ sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-noopt.stat \ if [ $? -ne 0 ] ; then no_result ; fi activity="run non-optimizing program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode \ $TEMPDIR/expr-noopt.stat >$TEMPDIR/expr-noopt.err 2> $TEMPDIR/expr-noopt.out activity="compare non-optimizing output" @@ -1593,7 +1593,7 @@ sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-opt-pos.stat \ if [ $? -ne 0 ] ; then no_result ; fi activity="run optimizing postfix program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode \ $TEMPDIR/expr-opt-pos.stat >$TEMPDIR/expr-opt-pos.err 2> $TEMPDIR/expr-opt-pos.out if [ $? -eq 0 ] ; then no_result ; fi @@ -1605,7 +1605,7 @@ sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-noopt-pos.stat \ if [ $? -ne 0 ] ; then no_result ; fi activity="run non-optimizing postfix program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode \ $TEMPDIR/expr-noopt-pos.stat >$TEMPDIR/expr-noopt-pos.err 2> $TEMPDIR/expr-noopt-pos.out if [ $? -eq 0 ] ; then no_result ; fi diff --git a/tests/expressions/randist.sh b/tests/expressions/randist.sh index adfdb00642..188e8ac315 100755 --- a/tests/expressions/randist.sh +++ b/tests/expressions/randist.sh @@ -60,7 +60,7 @@ perl $top_srcdir/tests/expressions/randist/randist.pl \ if [ $? -ne 0 ] ; then no_result ; fi activity="run command file" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode \ $TEMPDIR/randist.pspp >$TEMPDIR/randist.err 2> $TEMPDIR/randist.out if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/expressions/valuelabel.sh b/tests/expressions/valuelabel.sh index c1b96bcd21..ef21e041f5 100755 --- a/tests/expressions/valuelabel.sh +++ b/tests/expressions/valuelabel.sh @@ -82,7 +82,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/valuelabel.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/valuelabel.stat if [ $? -ne 0 ] ; then fail ; fi activity="compare results" diff --git a/tests/expressions/variables.sh b/tests/expressions/variables.sh index b9da30fb0b..8ffe3c8d87 100755 --- a/tests/expressions/variables.sh +++ b/tests/expressions/variables.sh @@ -97,7 +97,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/variables.stat > $TEMPDIR/variables.err 2> $TEMPDIR/variables.out +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/variables.stat > $TEMPDIR/variables.err 2> $TEMPDIR/variables.out if [ $? -ne 0 ] ; then fail ; fi activity="compare results" diff --git a/tests/expressions/vectors.sh b/tests/expressions/vectors.sh index 62749d6743..82989720bc 100755 --- a/tests/expressions/vectors.sh +++ b/tests/expressions/vectors.sh @@ -74,7 +74,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/vectors.stat > $TEMPDIR/vectors.err 2> $TEMPDIR/vectors.out +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/vectors.stat > $TEMPDIR/vectors.err 2> $TEMPDIR/vectors.out if [ $? -ne 0 ] ; then fail ; fi activity="compare results" diff --git a/tests/formats/float-format.sh b/tests/formats/float-format.sh index 60861b51a7..b146d18993 100755 --- a/tests/formats/float-format.sh +++ b/tests/formats/float-format.sh @@ -145,7 +145,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TEMPDIR/float-format.pspp +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/float-format.pspp if [ $? -ne 0 ] ; then fail ; fi pass diff --git a/tests/stats/descript-basic.sh b/tests/stats/descript-basic.sh index 8f772ed379..765172b287 100755 --- a/tests/stats/descript-basic.sh +++ b/tests/stats/descript-basic.sh @@ -78,7 +78,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/descript.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/descript.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/stats/descript-mean-bug.sh b/tests/stats/descript-mean-bug.sh index a34286deea..defe833f04 100755 --- a/tests/stats/descript-mean-bug.sh +++ b/tests/stats/descript-mean-bug.sh @@ -71,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/descript.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/descript.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/stats/descript-missing.sh b/tests/stats/descript-missing.sh index 574ecf29d5..8759343015 100755 --- a/tests/stats/descript-missing.sh +++ b/tests/stats/descript-missing.sh @@ -79,7 +79,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/descript.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/descript.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/stats/moments.sh b/tests/stats/moments.sh index 63c9a17a87..947b4cd1d7 100755 --- a/tests/stats/moments.sh +++ b/tests/stats/moments.sh @@ -81,7 +81,7 @@ sed < $TEMPDIR/moments-list-2p >> $TEMPDIR/moments-2p.stat \ if [ $? -ne 0 ] ; then no_result ; fi activity="run two-pass program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode \ $TEMPDIR/moments-2p.stat >$TEMPDIR/moments-2p.err 2> $TEMPDIR/moments-2p.out activity="compare two-pass output" @@ -95,7 +95,7 @@ sed < $TEMPDIR/moments-list-1p >> $TEMPDIR/moments-1p.stat \ if [ $? -ne 0 ] ; then no_result ; fi activity="run one-pass program" -$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode \ $TEMPDIR/moments-1p.stat >$TEMPDIR/moments-1p.err 2> $TEMPDIR/moments-1p.out activity="compare one-pass output" diff --git a/tests/stats/ntiles.sh b/tests/stats/ntiles.sh index 66b49a7518..f696cf95b5 100755 --- a/tests/stats/ntiles.sh +++ b/tests/stats/ntiles.sh @@ -74,7 +74,7 @@ EOF if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="move output" @@ -103,7 +103,7 @@ EOF if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/stats/percentiles-compatible.sh b/tests/stats/percentiles-compatible.sh index 58ae27a8f6..63a19068d6 100755 --- a/tests/stats/percentiles-compatible.sh +++ b/tests/stats/percentiles-compatible.sh @@ -79,7 +79,7 @@ EOF if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output $i" diff --git a/tests/stats/percentiles-enhanced.sh b/tests/stats/percentiles-enhanced.sh index eb04989cd6..6d6e2b0312 100755 --- a/tests/stats/percentiles-enhanced.sh +++ b/tests/stats/percentiles-enhanced.sh @@ -78,7 +78,7 @@ EOF if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output $i" @@ -141,7 +141,7 @@ if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output $i" @@ -202,7 +202,7 @@ if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output $i" @@ -262,7 +262,7 @@ if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output $i" diff --git a/tests/xforms/recode.sh b/tests/xforms/recode.sh index 9a4da5179f..46586bdba0 100755 --- a/tests/xforms/recode.sh +++ b/tests/xforms/recode.sh @@ -156,7 +156,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="test output" -- 2.30.2