diff options
| -rw-r--r-- | ChangeLog | 24 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | testsuite/lib/libdejagnu.exp | 1 | ||||
| -rw-r--r-- | testsuite/lib/runtest.exp (renamed from testsuite/config/default.exp) | 1 |
4 files changed, 29 insertions, 2 deletions
@@ -1,5 +1,18 @@ 2018-10-31 Jacob Bachmeyer <jcb62281@gmail.com> + * Makefile.am (DEJATOOL): List tools in testsuite. + (RUNTESTDEFAULTFLAGS): Adjust to support per-tool testing. + * testsuite/config/default.exp: Rename from this ... + * testsuite/lib/runtest.exp: ... to this. + (runtest_exit): Remove spurious "close". This was causing per-tool + testing to fail, since the testsuite for "runtest" never actually + uses "spawn", so "close" ends up closing exp0, which is the + terminal. The ${tool}_exit proc is not called if the --tool + option is not given, so this had no effect earlier. + * testsuite/lib/libdejagnu.exp: New empty file. + +2018-10-31 Jacob Bachmeyer <jcb62281@gmail.com> + * runtest.exp (load_tool_init): Add message indicating the expected location of the tool init file. @@ -11,6 +24,17 @@ * configure.ac (DEJAGNU): Add comments. + * Makefile.am (DEJATOOL): List tools in testsuite. + (RUNTESTDEFAULTFLAGS): Adjust to support per-tool testing. + * testsuite/config/default.exp: Rename from this ... + * testsuite/lib/runtest.exp: ... to this. + (runtest_exit): Remove spurious "close". + This was causing per-tool testing to fail, since the testsuite for + "runtest" never actually uses "spawn", so "close" ends up closing + exp0, which is the terminal. The ${tool}_exit proc is not called + if the --tool option is not given, so this had no effect earlier. + * testsuite/lib/libdejagnu.exp: New empty file. + 2018-10-30 Ben Elliston <bje@gnu.org> * Makefile.am (DISTCLEANFILES): Add testrun.xml. diff --git a/Makefile.am b/Makefile.am index 93323af..91d58e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -163,8 +163,11 @@ TESTSUITE_FILES = \ testsuite/lib/util-defs.exp \ testsuite/libdejagnu/tunit.exp +DEJATOOL = libdejagnu runtest + RUNTEST = ${top_srcdir}/runtest -RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)/testsuite RUNTEST=$(RUNTEST) +RUNTESTDEFAULTFLAGS = --tool $${tool} --srcdir $${srcdir}/testsuite +RUNTESTDEFAULTFLAGS += RUNTEST=$(RUNTEST) AM_CXXFLAGS = -I$(top_srcdir) -g check_PROGRAMS = unit diff --git a/testsuite/lib/libdejagnu.exp b/testsuite/lib/libdejagnu.exp new file mode 100644 index 0000000..fa81ada --- /dev/null +++ b/testsuite/lib/libdejagnu.exp @@ -0,0 +1 @@ +# empty file diff --git a/testsuite/config/default.exp b/testsuite/lib/runtest.exp index 86d2b5e..bd20b5a 100644 --- a/testsuite/config/default.exp +++ b/testsuite/lib/runtest.exp @@ -55,7 +55,6 @@ proc runtest_load { arg } { # runtest_exit -- exit the test driver for expect # proc runtest_exit { } { - close } # |