Re: PATCH: add dejagnu(1) multi-launcher [supplemental patch: Makefile.am]

[Jacob Bachmeyer]

Ben Elliston wrote:
> The patch is missing the changes to Makefile.am.
>   

? ...
So it is... it seems that the patch was exported with the wrong range of 
commits, somehow omitting the last commit on the branch.  (I suspect the 
mouse was subtly off when I selected "Make patch" in gitk and I did not 
notice.)  The patch correctly forms dejagnu as a new file (that was the 
first commit on the branch) and includes doc/dejagnu.1 (added in the 
second-to-last commit), so only the last commit updating Makefile.am is 
missing.  The Makefile.am patch is included below.

> Also, my version of shellcheck (0.5.0) reports:
>
> In dejagnu line 130:
>         $(grep '^set frame_version' "${datadir}/runtest.exp" \
>         ^-- SC2046: Quote this to prevent word splitting.
>   

That is the item mentioned in the run-up text that I chose to ignore:  
Emacs highlights it more readably without those quotes, the data grep is 
extracting is the DejaGnu version number (which does not contain 
spaces), and the expression is substituted into an "echo" command, where 
any word-splitting will simply result in echo inserting spaces.

If it is really a big problem, I can write a supplemental patch to 
inhibit the warning.

----
(ChangeLog entries included with previous patch.)
----
patch:
----
diff --git a/Makefile.am b/Makefile.am
index 1740d1a..b62e606 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,7 +21,7 @@
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)

@@ -31,7 +31,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 = \
@@ -142,6 +142,15 @@ 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/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 +167,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 +185,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/runtest.1
info_TEXINFOS = doc/dejagnu.texi
----


-- Jacob