diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/input/Makefile.in | 17 | ||||
| -rw-r--r-- | src/interp/g-error.boot | 2 | ||||
| -rw-r--r-- | src/interp/sys-driver.boot | 1 |
4 files changed, 19 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 64a27a91..6380319c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,14 @@ 2010-12-01 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/sys-driver.boot (executeSpadScript): Inform the system + that we are going to read from a file. + * interp/g-error.boot(handleLispBreakLoop): Return to reading from + file if that was what were doing. + * input/Makefile.in (TESTSYS): Use driver and --test option. + (%.output): Simplify. + +2010-12-01 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/sys-driver.boot (executeSpadScript): Handle --test option. * interp/setvars.boot (setOutputAlgebra): Control informative diff --git a/src/input/Makefile.in b/src/input/Makefile.in index d4adbb6f..0c2943a8 100644 --- a/src/input/Makefile.in +++ b/src/input/Makefile.in @@ -573,9 +573,14 @@ distclean-local: clean-local .SUFFIXES: .SUFFIXES: .input .output + +DRIVER = ../driver/open-axiom$(EXEEXT) -TESTSYS= $(axiom_target_bindir)/AXIOMsys -- --system="$(AXIOM)" \ - --sysalg="$(axiom_targetdir)/algebra/" +TESTSYS= \ + $(DRIVER) --execpath=$(axiom_target_bindir)/AXIOMsys$(EXEEXT) \ + --system="$(AXIOM)" \ + --sysalg="$(axiom_targetdir)/algebra/" \ + --test SKIP= antoine.output as-eg1.output as-eg2.output \ as-eg3.output as-eg4.output as-eg5.output as-eg6.output \ @@ -775,12 +780,6 @@ all-check: ${OUTS} @ echo 1 finished ./$(top_builddir)/int/input %.output: %.input - (echo running test file $< ; \ - echo ')set message test on' > tmp.input; \ - echo ')set message auto off' >> tmp.input ; \ - echo ')read $*' >> tmp.input ; \ - echo ')boot coreQuit()' >> tmp.input ; \ - echo 'systemCommand "read tmp.input"' | ${TESTSYS} | tee $*.output; \ - rm tmp.input ) + $(TESTSYS) $< | tee $*.output diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot index 5f31421d..b88206b8 100644 --- a/src/interp/g-error.boot +++ b/src/interp/g-error.boot @@ -132,7 +132,7 @@ handleLispBreakLoop($BreakMode) == sayBrightly '" Processing will continue where it was interrupted." THROW($SpadReaderTag, nil) - $BreakMode = 'resume => + $BreakMode = 'resume or $ReadingFile => returnToReader() returnToTopLevel() diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot index 80512847..ab3620e9 100644 --- a/src/interp/sys-driver.boot +++ b/src/interp/sys-driver.boot @@ -248,6 +248,7 @@ initializeGlobalState() == executeSpadScript(progname,options,file) == -- By default, we want script execution to be as quiet as possible. $displayStartMsgs: local := false + $ReadingFile: local := true -- $ProcessInteractiveValue: local := true $verbose: local := false initializeGlobalState() |