tests: avoid spurious failure when gcj is not installed

Since yesterday's commit, v1.11-2019-g4d2bf42,
the gcj4 test would fail when gcj is not installed.

* tests/defs-static.in (GNU_GCJ, GNU_GCJFLAGS): Define.
* tests/Makefile.am (do_subust): Add those to the list of
substituted symbols.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3c8c9d2..b6d41c7 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -156,6 +156,8 @@ do_subst = sed \
   -e 's|@GNU_FFLAGS[@]|$(GNU_FFLAGS)|g' \
   -e 's|@GNU_FC[@]|$(GNU_FC)|g' \
   -e 's|@GNU_FCFLAGS[@]|$(GNU_FCFLAGS)|g' \
+  -e 's|@GNU_GCJ[@]|$(GNU_GCJ)|g' \
+  -e 's|@GNU_GCJFLAGS[@]|$(GNU_GCJFLAGS)|g' \
   -e 's|@YACC[@]|$(YACC)|g' \
   -e 's|@LEX[@]|$(LEX)|g' \
   -e 's|@TEX[@]|$(TEX)|g' \

diff --git a/tests/defs-static.in b/tests/defs-static.in
index 6f79fe2..80cd1fe 100644 (file)
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -205,6 +205,8 @@ GNU_FFLAGS=${AM_TESTSUITE_GNU_FFLAGS-${GNU_FFLAGS-'@GNU_FFLAGS@'}}
 GNU_FCFLAGS=${AM_TESTSUITE_GNU_FCFLAGS-${GNU_FCFLAGS-'@GNU_FCFLAGS@'}}
 GNU_CXXFLAGS=${AM_TESTSUITE_GNU_CXXFLAGS-${GNU_CXXFLAGS-'@GNU_CXXFLAGS@'}}
 GNU_CFLAGS=${AM_TESTSUITE_GNU_CFLAGS-${GNU_CFLAGS-'@GNU_CFLAGS@'}}
+GNU_GCJ=${AM_TESTSUITE_GNU_GCJ-${GNU_GCJ-'@GNU_GCJ@'}}
+GNU_GCJFLAGS=${AM_TESTSUITE_GNU_GCJFLAGS-${GNU_GCJFLAGS-'@GNU_GCJFLAGS@'}}
 
 # No all versions of Tex support '--version', so we use a configure
 # check to decide if tex is available.  This decision is embodied in