[groff] 03/09: [gropdf]: Don't test if hobbled.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit e3954e5b15ae956c2ee7f98c8f323bfa9172e5a3
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat Feb 18 02:04:00 2023 -0600

    [gropdf]: Don't test if hobbled.
    
    [gropdf]: Don't run automated tests if 'gropdf' will be operating with
    reduced function.  If neither Ghostscript nor the URW fonts are
    available at configuration time, there is no point testing for
    successful build-time population of the font descriptions for the
    default and URW foundries.
    
    * font/devpdf/devpdf.am (font_devpdf_TESTS) [USE_GROPDF]: Run
      "check-default-foundry" only if gropdf is fully functional.
    
      (font_devpdf_TESTS) [USE_GROPDF && HAVE_URW_FONTS]: Run
      "check-urw-foundry" only if the URW fonts were found.
    
    Continues <https://savannah.gnu.org/bugs/?63808>.  Thanks to Deri James
    for the continued discussion.
---
 ChangeLog             | 16 ++++++++++++++++
 font/devpdf/devpdf.am | 16 ++--------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf1314759..c3752508f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2023-02-18  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [gropdf]: Don't run automated tests if 'gropdf' will be
+       operating with reduced function.  If neither Ghostscript nor the
+       URW fonts are available at configuration time, there is no point
+       testing for successful build-time population of the font
+       descriptions for the default and URW foundries.
+
+       * font/devpdf/devpdf.am (font_devpdf_TESTS) [USE_GROPDF]: Run
+       "check-default-foundry" only if gropdf is fully functional.
+       (font_devpdf_TESTS) [USE_GROPDF && HAVE_URW_FONTS]: Run
+       "check-urw-foundry" only if the URW fonts were found.
+
+       Continues <https://savannah.gnu.org/bugs/?63808>.  Thanks to
+       Deri James for the continued discussion.
+
 2023-02-18  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [gropdf]: Rename tests to more accurately characterize their
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index e55e38851..ddf34e625 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -178,20 +178,8 @@ uninstall_devpdf:
          rmdir $(DESTDIR)$(devpdffontdir); \
        fi
 
-# Automake has no logical 'and' operator; we test HAVE_GHOSTSCRIPT and
-# HAVE_URW_FONTS separately, with a potentially redundant assignment.
-
-if HAVE_GHOSTSCRIPT
-font_devpdf_TESTS = \
-  font/devpdf/tests/check-default-foundry.sh
-endif
-
-if HAVE_URW_FONTS
-font_devpdf_TESTS = \
-  font/devpdf/tests/check-urw-foundry.sh
-endif
-
-if HAVE_GHOSTSCRIPT
+if USE_GROPDF
+font_devpdf_TESTS = font/devpdf/tests/check-default-foundry.sh
 if HAVE_URW_FONTS
 font_devpdf_TESTS += font/devpdf/tests/check-urw-foundry.sh
 endif