--- src/ui/terminal/main.c | 9 ++++++++- 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 +- 113 files changed, 152 insertions(+), 145 deletions(-) --- src/ui/terminal/main.c.orig +++ 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 (;;) --- tests/bugs/agg-crash-2.sh.orig +++ 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 --- tests/bugs/agg_crash.sh.orig +++ 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 --- tests/bugs/alpha-freq.sh.orig +++ 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 --- tests/bugs/big-input-2.sh.orig +++ 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++) { p 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; --- tests/bugs/big-input.sh.orig +++ 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; --- tests/bugs/case-map.sh.orig +++ 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; --- tests/bugs/comment-at-eof.sh.orig +++ 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; --- tests/bugs/compression.sh.orig +++ 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 --- tests/bugs/compute-fmt.sh.orig +++ 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 --- tests/bugs/compute-lv.sh.orig +++ 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 --- tests/bugs/compute-sum.sh.orig +++ 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" --- tests/bugs/computebug.sh.orig +++ 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 --- tests/bugs/crosstabs-crash.sh.orig +++ tests/bugs/crosstabs-crash.sh @@ -66,7 +66,7 @@ CROSSTABS VARIABLES X (1,7) Y (1,7) /TAB 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 --- tests/bugs/crosstabs.sh.orig +++ 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 --- tests/bugs/curtailed.sh.orig +++ 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 --- tests/bugs/data-crash.sh.orig +++ 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; --- tests/bugs/double-frequency.sh.orig +++ 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 --- tests/bugs/empty-do-repeat.sh.orig +++ 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; --- tests/bugs/examine-1sample.sh.orig +++ 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 --- tests/bugs/examine-missing.sh.orig +++ 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; --- tests/bugs/freq-nolabels.sh.orig +++ 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 --- tests/bugs/get-no-file.sh.orig +++ 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 --- tests/bugs/get.sh.orig +++ 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 --- tests/bugs/if_crash.sh.orig +++ 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 --- tests/bugs/input-crash.sh.orig +++ 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 --- tests/bugs/keep-all.sh.orig +++ 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 --- tests/bugs/lag_crash.sh.orig +++ 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 --- tests/bugs/match-files-scratch.sh.orig +++ 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 --- tests/bugs/multipass.sh.orig +++ 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 --- tests/bugs/print-crash.sh.orig +++ 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 --- tests/bugs/random.sh.orig +++ 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 --- tests/bugs/recode-copy-bug.sh.orig +++ 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 --- tests/bugs/signals.sh.orig +++ 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 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 --- tests/bugs/t-test-alpha.sh.orig +++ 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" --- tests/bugs/t-test-alpha2.sh.orig +++ 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 --- tests/bugs/t-test-with-temp.sh.orig +++ 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" --- tests/bugs/t-test.sh.orig +++ 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; --- tests/bugs/temp-freq.sh.orig +++ 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 --- tests/bugs/temporary.sh.orig +++ 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 --- tests/bugs/val-labs-trailing-slash.sh.orig +++ 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 --- tests/bugs/val-labs.sh.orig +++ 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; --- tests/command/aggregate.sh.orig +++ tests/command/aggregate.sh @@ -214,7 +214,7 @@ for outfile in scratch active external; 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" --- tests/command/autorecod.sh.orig +++ 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" --- tests/command/beg-data.sh.orig +++ 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" --- tests/command/bignum.sh.orig +++ 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 ... --- tests/command/count.sh.orig +++ 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 --- tests/command/data-list.sh.orig +++ 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" --- tests/command/do-repeat.sh.orig +++ 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" --- tests/command/erase.sh.orig +++ tests/command/erase.sh @@ -77,7 +77,7 @@ if [ ! -f $TEMPDIR/foobar ] ; then fail # 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 --- tests/command/examine-extremes.sh.orig +++ 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" --- tests/command/examine-percentiles.sh.orig +++ 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 --- tests/command/examine.sh.orig +++ 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 --- tests/command/file-handle.sh.orig +++ 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 --- tests/command/file-label.sh.orig +++ 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 --- tests/command/filter.sh.orig +++ 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 --- tests/command/flip.sh.orig +++ 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" --- tests/command/import-export.sh.orig +++ 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" --- tests/command/lag.sh.orig +++ 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" --- tests/command/list.sh.orig +++ 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 --- tests/command/longvars.sh.orig +++ 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" --- tests/command/loop.sh.orig +++ 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" --- tests/command/match-files.sh.orig +++ 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" --- tests/command/missing-values.sh.orig +++ 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 --- tests/command/n_of_cases.sh.orig +++ 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 --- tests/command/no_case_size.sh.orig +++ 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" --- tests/command/npar-binomial.sh.orig +++ 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" --- tests/command/npar-chisquare.sh.orig +++ 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 --- tests/command/oneway-missing.sh.orig +++ 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" --- tests/command/oneway-with-splits.sh.orig +++ 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 --- tests/command/oneway.sh.orig +++ 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 --- tests/command/permissions.sh.orig +++ 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" --- tests/command/print-strings.sh.orig +++ 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 --- tests/command/print.sh.orig +++ 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" --- tests/command/rank.sh.orig +++ 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 --- tests/command/regression.sh.orig +++ 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 --- tests/command/rename.sh.orig +++ 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" --- tests/command/sample.sh.orig +++ 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" --- tests/command/sort.sh.orig +++ 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 --- tests/command/split-file.sh.orig +++ 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" --- tests/command/sysfile-info.sh.orig +++ 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" --- tests/command/sysfiles-old.sh.orig +++ 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" --- tests/command/sysfiles.sh.orig +++ 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" --- tests/command/t-test-1-indep-val.sh.orig +++ 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 --- tests/command/t-test-1-sample-missing-anal.sh.orig +++ 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" --- tests/command/t-test-1-sample-missing-list.sh.orig +++ 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" --- tests/command/t-test-1s.sh.orig +++ 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" --- tests/command/t-test-groups.sh.orig +++ 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" --- tests/command/t-test-indep-missing-anal.sh.orig +++ 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 --- tests/command/t-test-indep-missing-list.sh.orig +++ 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 --- tests/command/t-test-paired-missing-anal.sh.orig +++ 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 --- tests/command/t-test-paired-missing-list.sh.orig +++ 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 --- tests/command/t-test-pairs.sh.orig +++ 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" --- tests/command/tabs.sh.orig +++ 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 --- tests/command/trimmed-mean.sh.orig +++ 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 --- tests/command/use.sh.orig +++ 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 --- tests/command/vector.sh.orig +++ 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" --- tests/command/very-long-strings.sh.orig +++ 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 --- tests/command/weight.sh.orig +++ 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" --- tests/expressions/expressions.sh.orig +++ tests/expressions/expressions.sh @@ -1561,7 +1561,7 @@ sed < $TEMPDIR/expr-list >> $TEMPDIR/exp 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/exp 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/exp 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/exp 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 --- tests/expressions/randist.sh.orig +++ tests/expressions/randist.sh @@ -60,7 +60,7 @@ perl $top_srcdir/tests/expressions/randi 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 --- tests/expressions/valuelabel.sh.orig +++ 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" --- tests/expressions/variables.sh.orig +++ 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" --- tests/expressions/vectors.sh.orig +++ 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" --- tests/formats/float-format.sh.orig +++ 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 --- tests/stats/descript-basic.sh.orig +++ 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" --- tests/stats/descript-mean-bug.sh.orig +++ 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" --- tests/stats/descript-missing.sh.orig +++ 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" --- tests/stats/moments.sh.orig +++ tests/stats/moments.sh @@ -81,7 +81,7 @@ sed < $TEMPDIR/moments-list-2p >> $TEMPD 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 >> $TEMPD 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" --- tests/stats/ntiles.sh.orig +++ 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" --- tests/stats/percentiles-compatible.sh.orig +++ 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" --- tests/stats/percentiles-enhanced.sh.orig +++ 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" --- tests/xforms/recode.sh.orig +++ 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"