diff options
| author | Jacob Bachmeyer <jcb62281@gmail.com> | 2018-12-20 21:24:35 +1100 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2018-12-20 21:24:35 +1100 |
| commit | 2f6e46b9820647476ddd568e14d76661abb4f493 (patch) | |
| tree | 39dbd80189617ad46ecabcbc2fee82a59d3e529d /Makefile.am | |
| parent | 80d14caf5d1b26233bb25431243fdfe38cd3f92a (diff) | |
| download | dejagnu-2f6e46b9820647476ddd568e14d76661abb4f493.zip dejagnu-2f6e46b9820647476ddd568e14d76661abb4f493.tar.gz dejagnu-2f6e46b9820647476ddd568e14d76661abb4f493.tar.bz2 | |
* Makefile.am (EXTRA_DIST): Add "dejagnu" launcher script and
contents of $(commands_DATA).
(bin_SCRIPTS): Add "dejagnu" launcher script.
(commandsdir): Installation directory for "dejagnu" subcommands is
$(pkgdatadir)/commands.
(commands_DATA): New, contains "commands/help.sh" as initial item.
(TESTSUITE_FILES): Add testsuite for same.
(DEJATOOL): Add "launcher" to list of tools to test.
(dist_man_MANS): Add man pages for "dejagnu" and "dejagnu help".
* doc/dejagnu.texi (Running other DejaGnu commands): New chapter.
(Invoking dejagnu): New node for dejagnu(1) launcher script.
(Invoking dejagnu help): New node.
* doc/dejagnu.1: New man page.
* doc/dejagnu-help.1: New man page.
* dejagnu: New script.
* commands/help.sh: New dejagnu subcommand for reading manpages.
* testsuite/launcher.all/command.exp: New file.
* testsuite/launcher.all/command/commands/bar-baz.awk: New file.
* testsuite/launcher.all/command/commands/bar.awk: New file.
* testsuite/launcher.all/command/commands/bar.sh: New file.
* testsuite/launcher.all/command/commands/baz-quux.gawk: New file.
* testsuite/launcher.all/command/commands/foo.sh: New file.
* testsuite/launcher.all/command/commands/foo.tcl: New file.
* testsuite/launcher.all/help.exp: New file.
* testsuite/launcher.all/interp.exp: New file.
* testsuite/launcher.all/verbose.exp: New file.
* testsuite/lib/launcher.exp: New file.
Signed-off-by: Ben Elliston <bje@gnu.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 1740d1a..1f19846 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 1992-2016 Free Software Foundation, Inc. +# Copyright (C) 1992-2016, 2018 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -21,9 +21,10 @@ AUTOMAKE_OPTIONS = dejagnu export DEJAGNU -EXTRA_DIST = ChangeLog-1992 MAINTAINERS runtest \ +EXTRA_DIST = ChangeLog-1992 MAINTAINERS dejagnu runtest \ $(pkgdata_DATA) $(config_DATA) $(baseboard_DATA) \ - $(TESTSUITE_FILES) $(XML) $(CONTRIB) $(TEXINFO_TEX) + $(commands_DATA) $(TESTSUITE_FILES) $(TEXINFO_TEX)\ + $(XML) $(CONTRIB) DISTCLEANFILES = options-init.exp stats-init.exp @@ -31,7 +32,7 @@ DISTCLEANFILES = options-init.exp stats-init.exp all-local: @echo "Done. Now run 'make install'." -bin_SCRIPTS = runtest +bin_SCRIPTS = dejagnu runtest include_HEADERS = dejagnu.h pkgdata_DATA = \ @@ -57,6 +58,10 @@ pkgdata_DATA = \ lib/tip.exp \ lib/utils.exp +commandsdir = $(pkgdatadir)/commands +commands_DATA = \ + commands/help.sh + configdir = $(pkgdatadir)/config config_DATA = \ config/README \ @@ -142,6 +147,16 @@ CONTRIB = contrib/compare_tests contrib/sum2junit.sh \ # Testsuite. TESTSUITE_FILES = \ + testsuite/launcher.all/command.exp \ + testsuite/launcher.all/command/commands/bar-baz.awk \ + testsuite/launcher.all/command/commands/bar.awk \ + testsuite/launcher.all/command/commands/bar.sh \ + testsuite/launcher.all/command/commands/baz-quux.gawk \ + testsuite/launcher.all/command/commands/foo.sh \ + testsuite/launcher.all/command/commands/foo.tcl \ + testsuite/launcher.all/help.exp \ + testsuite/launcher.all/interp.exp \ + testsuite/launcher.all/verbose.exp \ testsuite/runtest.libs/topdir/subdir1/subsubdir1/subsubfile1 \ testsuite/runtest.libs/topdir/subdir1/subfile1 \ testsuite/runtest.libs/topdir/subdir1/subfile2 \ @@ -158,13 +173,14 @@ TESTSUITE_FILES = \ testsuite/runtest.main/options/testsuite/null.test/null.exp \ testsuite/runtest.main/stats.exp \ testsuite/runtest.main/stats/testsuite/stat.test/stats-sub.exp \ + testsuite/lib/launcher.exp \ testsuite/lib/libdejagnu.exp \ testsuite/lib/libsup.exp \ testsuite/lib/runtest.exp \ testsuite/lib/util-defs.exp \ testsuite/libdejagnu/tunit.exp -DEJATOOL = libdejagnu runtest +DEJATOOL = launcher libdejagnu runtest RUNTEST = ${top_srcdir}/runtest @@ -175,5 +191,5 @@ unit_SOURCES = testsuite/libdejagnu/unit.cc # Documentation. TEXINFO_TEX = doc/texinfo.tex -dist_man_MANS = doc/runtest.1 +dist_man_MANS = doc/dejagnu.1 doc/dejagnu-help.1 doc/runtest.1 info_TEXINFOS = doc/dejagnu.texi |