[groff] 03/03: Un-generate nroff test script.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 5eac8671f02554d988de3302d2aade7954d3c40c
Author: G. Branden Robinson <address@hidden>
AuthorDate: Mon Apr 13 22:40:56 2020 +1000

    Un-generate nroff test script.
    
    * src/roff/nroff/tests/verbose_option_works.sh.in: Rename to...
    * src/roff/nroff/tests/verbose_option_works.sh: ...this.  Since we no
      longer use @GROFF_BIN_PATH_SETUP@, there is no longer any content
      dependent on the build environment.
    
    * src/roff/nroff/nroff.am: Stop generating the above test script.  It
      can now be run as it ships.
---
 ChangeLog                                           | 21 +++++++++++++--------
 src/roff/nroff/nroff.am                             | 18 +++---------------
 ...e_option_works.sh.in => verbose_option_works.sh} |  0
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0304051..32bf421 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,16 +8,21 @@
        we are called that way.  Let test cases tell us to use
        test-groff as groff with an environment variable.
 
-       * src/roff/nroff/tests/verbose_option_works.sh.in: Check the
-       nroff version being tested against the groff version being
+       * src/roff/nroff/tests/verbose_option_works.sh.in: Rename to...
+       * src/roff/nroff/tests/verbose_option_works.sh: ...this.  Check
+       the nroff version being tested against the groff version being
        wrapped.  This exposes a bug; the system groff rather than the
        build tree groff was being invoked.  Refactor.  Stop messing
-       with @GROFF_BIN_PATH_SETUP@; instead, let test-groff handle that
-       for us.  Locate it and export the variable GROFF_TEST_GROFF so
-       nroff can find it.  Because we manipulate $PATH to run the
-       tests, the $PATH of an installed groff system will _always_
-       differ from that used by a build tree, ignore it in the test
-       cases.  Dispose of bashisms and set shebang to /bin/sh.
+       with @GROFF_BIN_PATH_SETUP@ (enabling the rename); instead, let
+       test-groff handle that for us.  Locate it and export the
+       variable GROFF_TEST_GROFF so nroff can find it.  Because we
+       manipulate $PATH to run the tests, the $PATH of an installed
+       groff system will _always_ differ from that used by a build
+       tree; ignore it in the test cases.  Dispose of bashisms and set
+       shebang to /bin/sh.
+
+       * src/roff/nroff/nroff.am: Stop generating the above test
+       script.  It can now be run as it ships.
 
 2020-04-13  G. Branden Robinson <address@hidden>
 
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index 8e545ff..9f34b8b 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -19,28 +19,16 @@
 
 prefixexecbin_SCRIPTS += nroff
 nroff_srcdir = $(top_srcdir)/src/roff/nroff
-nroff_testdir = $(top_builddir)/src/roff/nroff/tests
 PREFIXMAN1 += src/roff/nroff/nroff.1
 EXTRA_DIST += \
   src/roff/nroff/nroff.1.man \
-  src/roff/nroff/nroff.sh \
-  src/roff/nroff/tests/verbose_option_works.sh.in
+  src/roff/nroff/nroff.sh
 
 nroff_TESTS = \
   src/roff/nroff/tests/verbose_option_works.sh
 TESTS += $(nroff_TESTS)
-src/roff/nroff/tests/verbose_option_works.sh: \
-  $(top_builddir)/config.status \
-  $(top_srcdir)/src/roff/nroff/tests/verbose_option_works.sh.in \
-  $(SH_DEPS_SED_SCRIPT)
-       $(MKDIR_P) $(nroff_testdir) \
-       && sed -f $(SH_DEPS_SED_SCRIPT) \
-              -e $(SH_SCRIPT_SED_CMD) \
-              -e "s|[@]VERSION[@]|$(VERSION)|" \
-              $(top_srcdir)/src/roff/nroff/tests/verbose_option_works.sh.in \
-              >$@ \
-       && chmod +x $@
-MOSTLYCLEANFILES += $(nroff_TESTS) $(nroff_testdir)
+
+MOSTLYCLEANFILES += $(nroff_TESTS)
 
 nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT)
        $(AM_V_GEN)rm -f $@ \
diff --git a/src/roff/nroff/tests/verbose_option_works.sh.in 
b/src/roff/nroff/tests/verbose_option_works.sh
similarity index 100%
rename from src/roff/nroff/tests/verbose_option_works.sh.in
rename to src/roff/nroff/tests/verbose_option_works.sh