aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/setvars.boot3
-rw-r--r--src/interp/sys-driver.boot6
2 files changed, 7 insertions, 2 deletions
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index ed8423ab..d53769a6 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -1016,7 +1016,8 @@ setOutputAlgebra arg ==
SHUT $algebraOutputStream
$algebraOutputStream := testStream
$algebraOutputFile := object2String filename
- sayKeyedMsg("S2IV0004",['"Algebra",$algebraOutputFile])
+ -- Inform of redirection only if verbosity is desired.
+ $verbose and sayKeyedMsg("S2IV0004",['"Algebra",$algebraOutputFile])
sayKeyedMsg("S2IV0003",[fn,ft,fm])
sayKeyedMsg("S2IV0005",NIL)
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index f450e397..80512847 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -252,7 +252,8 @@ executeSpadScript(progname,options,file) ==
$verbose: local := false
initializeGlobalState()
outfile := getOptionValue "output"
- talkative := outfile or $verbose
+ testing := getOptionValue "test"
+ talkative := outfile or testing or $verbose
setOutputAlgebra [(talkative => 'on; 'off)]
-- FIXME: redirect standard output to null if not talkative
$printVoidIfTrue: local := talkative
@@ -264,6 +265,9 @@ executeSpadScript(progname,options,file) ==
if outfile ~= nil then
setOutputAlgebra [outfile]
setStandardOutputToAlgebraStream()
+ -- Accomodate for testsuite stream.
+ if testing then
+ set ["message","testing","on"]
CATCH($intCoerceFailure,
CATCH($SpadReaderTag,read [file]))
coreQuit (errorCount()> 0 => 1; 0)