diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-01 17:26:32 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-01 17:26:32 +0000 |
| commit | c32856c7077d6220b6785b1e6e819b41ea4244be (patch) | |
| tree | c2d1cb1eb2e989b78358a19a5795cd7533a42cd6 /src/input | |
| parent | 1cde83a3abd3d16e32bce7ec96629db339d60fa8 (diff) | |
| download | open-axiom-c32856c7077d6220b6785b1e6e819b41ea4244be.tar.gz | |
* 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.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/Makefile.in | 17 |
1 files changed, 8 insertions, 9 deletions
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 |