diff options
| author | Jacob Bachmeyer <jcb62281@gmail.com> | 2018-10-31 21:53:35 +1100 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2018-10-31 21:53:35 +1100 |
| commit | 33121d67a8240edcb21e8ccac3a312cfe6a327ca (patch) | |
| tree | 02c9e75e41da0ead9f60379fbccf12c546e66b2b /Makefile.am | |
| parent | a8a1219619ff54d30cf4c70e8376489f7aeef761 (diff) | |
| download | dejagnu-33121d67a8240edcb21e8ccac3a312cfe6a327ca.tar.gz dejagnu-33121d67a8240edcb21e8ccac3a312cfe6a327ca.tar.bz2 dejagnu-33121d67a8240edcb21e8ccac3a312cfe6a327ca.zip | |
* 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.
Signed-off-by: Ben Elliston <bje@gnu.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
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 |