(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).

diff --git a/src/ui/terminal/ChangeLog b/src/ui/terminal/ChangeLog
index b3063bd28162ede2d072b2156ed9a5f0f45036fd..374bc52bf5cd59945539d5e6cfaa9dbe807f9491 100644 (file)
--- a/src/ui/terminal/ChangeLog
+++ b/src/ui/terminal/ChangeLog
@@ -1,8 +1,13 @@
 2007-08-26  Ben Pfaff  <blp@gnu.org>
 
+       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  <blp@gnu.org>
 

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 9143220d3147accd05b935481909c22b1d6b1faa..9375ffc62960317cb7825fcfa0189a82e1a3ccb5 100644 (file)
--- 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 6c378de604334e8f46372273477df9c0973d1adb..a51e779e19048249b06f8da209d12fb0c9a97ec4 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-26  Ben Pfaff  <blp@gnu.org>
+
+       * 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  <blp@gnu.org>
 
        * 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 70db8cf607daf81af6a87dcfbadc2231aafbea16..cdb94cdc2d9f2645cbd4ccce38a03f943a9d8b89 100755 (executable)
--- 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 469cde7cf4dec57c7eeb5e4eabd8e131c5eb0de9..cc0bad23ce5537964d7eb45e2f22364191b87bc2 100755 (executable)
--- 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 687993053e5e89f57f2b16a00f627a2a4a376c6b..49d9fe25a3b44ef3bea4bda1d5f7f83f63a85904 100755 (executable)
--- 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 32b5bcfd3e9bff611c554f43b227ce835899b8d5..087e63a6f5c2b4a0f000df9e5e2db89dab573756 100755 (executable)
--- 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 10f31e2f604b1af4f1e323d60ffa6c3f1b592d3b..9e133556a3b7b0d490da3900557a2db3fa59c279 100755 (executable)
--- 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 479aea9c80c72a1887db002ef0e700b2070b6ebd..acc19dcfc3cc5bd9d1ade0e3ae7c7881135c9ed7 100755 (executable)
--- 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 617659b34ee44e8d382e9be157151fd1a11d0c87..638347482325983ec4e87310b73d36627e0f8853 100755 (executable)
--- 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 5b7178d28a594bc6cf515c9121a9655b7ad0c601..138b6ca5c3d54051f747ecd4e80646a44bbe472b 100755 (executable)
--- 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 ea860281fb43d58e919702d30f4579436f7ec926..2626b59521e8dff178ed0f664ea31c4315de3311 100755 (executable)
--- 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 784fe04694f487363ee1d68f2fe2b40c81339c49..8b7f7fd18c20643803b13290dca626980d0a0c29 100755 (executable)
--- 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 4b043a92153044c0889cfe9bc8ed2bcaf8d476c8..846ef79e5878864ada167d031aa825aec584b265 100755 (executable)
--- 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 cf9e4565545b581d128e3a9310cd3578ce0aeb9d..08077e57a838b7cd56fb2f99636e9384240409d8 100755 (executable)
--- 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 51cc23f59b8406f2850527e0848ad049722adf32..0531094a13768d1226cd5b6fef3e4e0664b37e41 100755 (executable)
--- 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 b4eb3dbec8cf68fb615901575d1612eabd9d5e05..818682d7301f0733d0c74dc27907e78cab59920d 100755 (executable)
--- 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 86acddf5c92c094758753d671472c2ce83115ece..9c46e9ffcdba3b1e418c37e0ed27120e78b0507a 100755 (executable)
--- 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 dd86502847bdf1d39bd89027e6f2d7ec00d5a9ae..1cf5d794501c53dd93ffd33b2058c27ebb35ef56 100755 (executable)
--- 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 b6e6a50f9ac347759c4dfaf06c38df0c994a4736..1c9405e876b5ce1c60803af437199a8268c2cea4 100755 (executable)
--- 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 ad82c23341decbf91e83d790b0785cdf8a6d15a0..9829230d0911abb3e16cccb5eedd65c04268fa2d 100755 (executable)
--- 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 00a6ce29b20e144b9a80a1992a71739503b30a67..8fe628f545d55cf56e1361a46983b8b88b6d47b1 100755 (executable)
--- 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 78b6be5f2fd3b99e9b740e3d1f582da4af78245c..a2e79cecf7e541963d9d741bfb4e565274b290ae 100755 (executable)
--- 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 0076b8cbdb605cb29d8250c685344b5ee91a943f..68bbd425d226b37867ea127c6f3245a8eba7e8d3 100755 (executable)
--- 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 45b688276ca78507d4b5dc7e2a36d003b2887d04..5e4de67a7f1d2130286dc7c30630051541969cfd 100755 (executable)
--- 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 024da3f1226a5cee8e88c3c250370e8df80927c5..1ab18044b3cbf9ab9925210768b5772712158d9a 100755 (executable)
--- 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 ef059e955b3ab56c3310bbef03a9a74e6d448b7c..bda4a73c6c74cbf999e3c6230cf3e48b9144a218 100755 (executable)
--- 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 2336c867e5b5ef1fb1a34e7cafdcc946cb6a69c3..f67b3d28a4fab8ee8275aa536d805d0d9894237c 100755 (executable)
--- 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 bd3deca86b0db11e0c998bd9f1100c470a3765b0..1450889ffb0e7c566b6e839066fc0ec48ace4d03 100755 (executable)
--- 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 ae3c3748a34e069846326eb485e5477c553befc4..87a411ad0d18e227460a4265c964382c6f353736 100755 (executable)
--- 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 e526cd51ec03ab0a661754452615b3243fe341b8..4830ddd359611169f6c9c6459e61e1dd9d9ecd64 100755 (executable)
--- 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 3e0b133943b09fd366af9aed9ecdc4bac476c1a4..24b3a5ed8cf48edb016173b3a754162f5fcec6e9 100755 (executable)
--- 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 ba1630f5b69c0d1cee7264dcb2d748b3876107b9..9c1a7677f99f2e078951e5ae533b3061a4f6b51b 100755 (executable)
--- 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 c7f3e8bee7fee13574a9c1ac98e7fd2de1325863..c41dbf00504d556e9dd96601ee0fff9c4c214a51 100755 (executable)
--- 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 7f838d61d287e91a59fcd48054d815a18f9d523c..9ba32baa46ced03d62f8fce777d4745eb98118d3 100755 (executable)
--- 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 3c2cf941e8ae8b3c3c89c752175fb3a71cc012d1..a2787f29c82b1bfa296bc4b77c6a84c5627645bf 100755 (executable)
--- 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 8cffe34cb414da4b54b213210f026228eb3835fb..f002d61f67a6f02cd6aa8c25464fc3e0fb9ebc37 100755 (executable)
--- 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 9568707f2ecebc2c06ac1ba4514bd20cab7345dd..b1450d182f5c514ccb93a71c3c0f0dfc7c95ed76 100755 (executable)
--- 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 e4bc0af4cd18a8017d484fc8e2717a959242997e..7882d8a587ec229692b03f0946ff345606832e5d 100755 (executable)
--- 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 9fac7dfc8be33dcc76cdc033fcac33105769ae4e..6386ac2c9980f9db54c0f0eb4bfa6cb3ad362972 100755 (executable)
--- 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 7ec3c012a49f21dd32f58730b5100f73816f9b3a..64f12ee9aa8f4836f43d0e0ef96e4467b5573211 100755 (executable)
--- 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 5aed6fde346ba2a38dd6b9d3ad76d0be61562a0c..d2091669a95a4106779432943e1192363e0f3ee2 100755 (executable)
--- 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 30c875ff65fae1288327659e586bc73e7790796f..a014aa7feb92fce7432f48a57ade57efe9bdff7c 100755 (executable)
--- 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 b27683b6c21f1e11844d91727047c7c0f7cfbe7e..c287bde804209d45c1d951cbae356bbb58e94d7d 100755 (executable)
--- 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 b95401818ab8f1edb938a4fa7f50a8b635ffb5cc..8fca96fab01db1991b6f770b3e84b4ce39d6367b 100755 (executable)
--- 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 57b2dc825f2627b1e061f9a5ff232ef48da6b7a6..47e00239acf26930ab06a3c2ea2c53752ea27992 100755 (executable)
--- 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 35f937b51cbb67afdaa51edb9897d9f15bb8372c..9071a47536ec20cef9185f71a8f5ff3a883c1b00 100755 (executable)
--- 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 fa6e31a4bcadf03ed7741a8d89193d194b63b831..e50819181402d9a996d86d801444030bbafac150 100755 (executable)
--- 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 7fa56cc4ba13a581592ce43baa75351333078623..7c70fa2113b478e7f6a07eb4b0d7f3d25e3fd7d2 100755 (executable)
--- 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 01a682c1e969175a317f012bbeb89af3c4a28791..fbad9c80d509a2d7e461f18921886518883aa760 100755 (executable)
--- 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 62000de630f3b02b3e1bd7ef3803e4289039b056..3f37618a65bd38055685e983b571f66614684c30 100755 (executable)
--- 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 bbb094e14e0ad16e49ac8402645335f1329f0c97..c16ed3dc7213830fc94203dc2e2d4f670ca334f3 100755 (executable)
--- 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 982a03bc32bd34ec05b1ba056eb7e65e406f784f..feb052c430c5d66b002605c70d5b44d067960086 100755 (executable)
--- 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 a1bb62ef496c6d288870d89584d3423b2ac6d8d7..8638d1ade670d7da619af2ca2fa09b8f1db414c8 100755 (executable)
--- 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 7c1f394221efdc48ff0612478a819003cfcfc16a..4f710f5bb80674c6f766d2a821bde38a0839edfb 100755 (executable)
--- 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 14596edbd5b06feed19ed61cf85faf867357b713..b41c5a5405d6c8eb04b8b11bb8c82a166494d0d0 100755 (executable)
--- 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 48d8739bf61dbd1bd75eac1cd86334d792213c72..4b6ab0e62200ea9af07b5cced5e2e7627ac1f8ec 100755 (executable)
--- 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 cf685ba97d024ef1a4ea740119f21ca3bfe8f515..40729c85ed7b8e896c8bad817e724c9c93e58d53 100755 (executable)
--- 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 cfafa9612cd717d2a792293a2ccd1dc0346d275f..dc2b1770146cc7802cd0223f2ddcb20d4a251d23 100755 (executable)
--- 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 8b88937f905972166a17c4cb2899c3036aea15ed..67fc8d2ab7278e1abc42243efedf8bf4d279b7ef 100755 (executable)
--- 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 4221fb7b88aba5ab81a708b8c2e16bf9a7175847..68f4f9c7939c8d0697cdf9cc9131b13b728a69dc 100755 (executable)
--- 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 a11ea78dd665719608844cea402596b778083856..ab95a0b35f5f2cc78db557ab418ee6dd64c77b68 100755 (executable)
--- 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 5baa5fd40c3ced0112488a4f38c19f55bf89c437..184be56520ce753677aa75efc1f1fb878ae4dd8f 100755 (executable)
--- 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 2b1383fe2e676be209077ffed075260275d6de51..d8f930c8b51d7e3eb36ad2527a596896fa73052b 100755 (executable)
--- 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 28b9674609de0d437a5a94f334452ab846f11206..bb4107e58fd4962a9d1d14dba8a192c6201ccdf6 100755 (executable)
--- 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 4936736d1eb7ea445851ecbecb0e2b651e8c5f66..4b1e0eb4e735c3c9617e210fd173537aa67d8cff 100755 (executable)
--- 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 472a345734c7e4c1e3b44108d709e3ea49b6d112..7c97e4458af3f6e42e1d419df7703f1ac7030d86 100755 (executable)
--- 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 e3fc2774d4b71b1fb25ca057b8ac54a958449f4d..0c94051a1eb8e5e8098e42d5b50cee7b5938a483 100755 (executable)
--- 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 6fc35117cb6b2a53536a2c8beab76b7975d212aa..8c9a9971369c8aa7eb94f39db9764bcd1e3e96e6 100755 (executable)
--- 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 5a1b8af17952375323ae25b754428902d3d476d2..7ac52d03661691ffcffcc0947394e2d885216b44 100755 (executable)
--- 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 989f8566d6d67563d804a4d82b8fcf02895d2ee3..ec3634ca705c7e2a7c0edfd5550f233a66ea5d90 100755 (executable)
--- 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 33cacd121ee213ce5fe57159ed69af2d3d11dab2..7197a096f8ee59709e9ef7529ed7baec9c2bbf5d 100755 (executable)
--- 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 c0d8dc33278e8a8eb8bb1ec53129f50d543fba3f..c5f251c136899f178c1dc1048e928955f13402eb 100755 (executable)
--- 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 2c6005ad252dd1a62b02d23174f72c04de352738..359efa1006829005aed576fcf76fbdf3a7cc0545 100755 (executable)
--- 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 383d0e7248bb2cff5f619090527844f977c59c68..114794f278654d4da43da71a03d39aa6e519fc02 100755 (executable)
--- 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 8d7a6160a1d96ed752a633607aef2594f475cfb9..c5de1e9fe6f40992fc9c8d0d23b4249c0d242464 100755 (executable)
--- 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 6b8760e6e2be37f79241d4d8f45fa1e933efd7e1..03f000a93a9acec4fb9e53d69b6fa1733be89451 100755 (executable)
--- 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 0fe9429872bf71b51714d1938806d7fcc0dde141..ddb78e1a317e7c2283f906ab3b1d5048eee0fc9d 100755 (executable)
--- 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 6eae4a52506604ae89b51f0e54b540a5de3e6287..2837223ed6afcdccf493982c40f0fdd8e3578544 100755 (executable)
--- 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 8a210d02633a80c681f83afb141691c59f4ace05..6ba6646bc1ae3d3e202142138ee765e77d7186d5 100755 (executable)
--- 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 1eb4d855ae59560860cf5f0169d32a96bfe2271a..00d4f403c314ba439e9cbe21bb3cf69d7d41eff0 100755 (executable)
--- 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 10e34ed9e229a913cf820612bea63c55f0a9f687..60b4d3a5574ef20599cdad654440483ed620b8e7 100755 (executable)
--- 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 73e981e132f4d401534738b2d996b1da43b1c7e5..f741ff85f1568031f55882c4398e05785f1f9417 100755 (executable)
--- 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 81ef556cfc454bd4af73645f429f07ba27ae2fd1..4b2c8cd40db5f3babe4b110b134210a9b88fa4c8 100755 (executable)
--- 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 7e0dcafcaf9ce950133aa62ecfd0437283bb3fc8..2bfd6a5b03163a3f8ae86752531694c2d7e5a4fd 100755 (executable)
--- 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 375167ccf347eff9c9421eec8f57ab88b219b65b..2490490130e6561098440e6b6b22e97765b181c0 100755 (executable)
--- 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 dcbc2eeed950bcef3bbf9997d1df32fbb5a680a8..51ec1dc13228b187ef82c5a9214340717e644329 100755 (executable)
--- 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 12865181bfcbec99ae146d29311f0d274445af9c..8d63a3e20d271e757cda310c16de4e9116fdf66d 100755 (executable)
--- 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 a24bb174ccbb74f81c96671b613057c3b459d24f..bf421bd45dc377aa4a26628104dec6f3f5e49847 100755 (executable)
--- 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 97963226f2edecf6a9d9f75695940a633e38920a..05cc1835fed7d7b613cd99a5ed9b4996d4359422 100755 (executable)
--- 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 6719faf851b1558af59fe1fb3811c169647b9c36..181c73b6bd72aebac1e42ee1bf96dd804f43604b 100755 (executable)
--- 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 ec97144d22c3ad82e5a70d36a97d4580ccbd2c71..2c7114f1bfb547233335cc1290487347ef7da281 100755 (executable)
--- 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 b0d346470bfa1e402c8c4169b574a3fb75c51cf0..533dfa4930edd8105654e699ae144d83c955e5b1 100755 (executable)
--- 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 d26fe3044c1d8b21ab6d04ca3d51b251401bc44c..4317a574a783c87234343a90aa200963ea4eca9c 100755 (executable)
--- 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 a228cffbdb8c7f3d55a3b046ba49a4b772fd844a..f657e8fb2cdb3259223603bbc8cb79d2f89d6cb4 100755 (executable)
--- 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 d93fd17897e37fff7cb4451f5ecdcb70c9e5f8cf..c6d968b1884b0c5269c921cf5a2cb2006671a7e6 100755 (executable)
--- 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 ea30f8f56cb0f2258f5b2887546a9772eb4352ad..7346e526cf00aa9c64cafa38380bd5e88b09de7c 100755 (executable)
--- 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 65532f44f5d0eb29dae08f3301445254b6317cde..f81b2264121b4545e78b47eabd5b372130beda78 100755 (executable)
--- 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 9e5045bf7ed1161738411d04d93e85a39c1b52c4..94c0c4693cb2c7dabb0bef63739c9dd7fbda7f59 100755 (executable)
--- 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 7489915e91ad41bb6f505d23db50dde9faac4464..d6c8042047414457e6c300a67144a8087839ebb1 100755 (executable)
--- 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 82d65e795c793bf32ba58effb1555ad848d8cec3..01bd0a318c5814b2056850c45573cfbffa2e20c2 100755 (executable)
--- 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 c87148946b75bb788a2d2103b5b29a1f4203d8e1..8f55efda3705c0e03eb96ee3dc78043274a27f16 100755 (executable)
--- 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 adfdb006425ebf767ea52bdeb33f7acc86209f43..188e8ac31544fe5655ebbacde523556f5a325fed 100755 (executable)
--- 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 c1b96bcd215c0032ece07ab84c120b74fb431bf2..ef21e041f5e0697398382ca660895631d4e696e8 100755 (executable)
--- 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 b9da30fb0b9489e98cedf016906bd8f3ae107d3b..8ffe3c8d87bebd533d39f84d1435d7744ed83ccb 100755 (executable)
--- 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 62749d6743fe86595031f40a63a16808383301ab..82989720bc057a4ef8f1df6c048a5edd31a19bbe 100755 (executable)
--- 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 60861b51a7484b6eb309ddd14d57aa1539bc6d07..b146d18993292329edf39287d9f8eeee3a7994bf 100755 (executable)
--- 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 8f772ed3795a37ae34815e8e6febf15157b6e35a..765172b2870935993d62155d3deb3736560b36c4 100755 (executable)
--- 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 a34286deea3775fbffa0c30c432b7397301939f5..defe833f041e029f58391e2ea241bebb9e84ffe7 100755 (executable)
--- 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 574ecf29d5572f7d12975c65a0b9a30494b79b7c..87593430150954b4f65ca65395c36f7785ac0fd8 100755 (executable)
--- 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 63c9a17a878769021ea075504ce31ceb51a47da0..947b4cd1d7afa382f31fac9161a1d942583b1ed2 100755 (executable)
--- 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 66b49a75181fa7090bc0c91640b846271004b4c6..f696cf95b597aea88614a4e16f9867daa11d30cd 100755 (executable)
--- 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 58ae27a8f69e53b6eaa904148afd22bf9f263e3a..63a19068d6705b8329f5a581db9a50ba28193153 100755 (executable)
--- 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 eb04989cd6d14f05bb97e4e4b814a61517488334..6d6e2b03126fb7982e4f1a604ce0dd8313942e31 100755 (executable)
--- 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 9a4da5179ff1e09be8d02a54ca97afd07c90c31c..46586bdba0ec020c30d08e242a023f0f04ea0962 100755 (executable)
--- 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"