diff options
| -rwxr-xr-x | configure | 20 | ||||
| -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 |
5 files changed, 29 insertions, 20 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for OpenAxiom 1.4.0-2010-11-30. +# Generated by GNU Autoconf 2.65 for OpenAxiom 1.4.0-2010-12-01. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.4.0-2010-11-30' -PACKAGE_STRING='OpenAxiom 1.4.0-2010-11-30' +PACKAGE_VERSION='1.4.0-2010-12-01' +PACKAGE_STRING='OpenAxiom 1.4.0-2010-12-01' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' PACKAGE_URL='' @@ -1491,7 +1491,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.4.0-2010-11-30 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.4.0-2010-12-01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1566,7 +1566,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-11-30:";; + short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-12-01:";; esac cat <<\_ACEOF @@ -1677,7 +1677,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.4.0-2010-11-30 +OpenAxiom configure 1.4.0-2010-12-01 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2569,7 +2569,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.4.0-2010-11-30, which was +It was created by OpenAxiom $as_me 1.4.0-2010-12-01, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -5468,7 +5468,7 @@ fi # Define the identity of the package. PACKAGE='openaxiom' - VERSION='1.4.0-2010-11-30' + VERSION='1.4.0-2010-12-01' cat >>confdefs.h <<_ACEOF @@ -20961,7 +20961,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.4.0-2010-11-30, which was +This file was extended by OpenAxiom $as_me 1.4.0-2010-12-01, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21027,7 +21027,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenAxiom config.status 1.4.0-2010-11-30 +OpenAxiom config.status 1.4.0-2010-12-01 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" 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() |