diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-01 08:59:07 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-01 08:59:07 +0000 |
| commit | 1cde83a3abd3d16e32bce7ec96629db339d60fa8 (patch) | |
| tree | 32df756728bd33e2f9b7d4371716fdbadac81c6b | |
| parent | 5a73a0e19044f6dc949b7633f5f64867a019cfdd (diff) | |
| download | open-axiom-1cde83a3abd3d16e32bce7ec96629db339d60fa8.tar.gz | |
* interp/sys-driver.boot (executeSpadScript): Handle --test
option.
* interp/setvars.boot (setOutputAlgebra): Control informative
message about algebra stream redirection by $verbose.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interp/setvars.boot | 3 | ||||
| -rw-r--r-- | src/interp/sys-driver.boot | 6 |
4 files changed, 15 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index c2438b99..bc98a285 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ dnl Makefiles for building OpenAxiom interpreter, compiler, libraries, and dnl auxiliary tools where appropriate. dnl -AC_INIT([OpenAxiom], [1.4.0-2010-11-30], +AC_INIT([OpenAxiom], [1.4.0-2010-12-01], [open-axiom-bugs@lists.sf.net]) dnl Most of the macros used in this configure.ac are defined in files diff --git a/src/ChangeLog b/src/ChangeLog index 7bd303d7..64a27a91 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2010-12-01 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/sys-driver.boot (executeSpadScript): Handle --test + option. + * interp/setvars.boot (setOutputAlgebra): Control informative + message about algebra stream redirection by $verbose. + +2010-12-01 Gabriel Dos Reis <gdr@cs.tamu.edu> + * lisp/core.lisp.in (handleCommandLine): Don't export. Rewrite. (RUN-DRIVER): Split from handleCommandLine. 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) |