[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2020-g06b9017

[Jim Meyering]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=06b901795fcb70182e1427b37e104d2a8e1524c4

The branch, master has been updated
       via  06b901795fcb70182e1427b37e104d2a8e1524c4 (commit)
      from  4d2bf42f63624e9db1d83abaf020ca79defefcd7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 06b901795fcb70182e1427b37e104d2a8e1524c4
Author: Jim Meyering <address@hidden>
Date:   Sat Feb 25 12:37:25 2012 +0100

    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.

-----------------------------------------------------------------------

Summary of changes:
 tests/Makefile.am    |    2 ++
 tests/defs-static.in |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3c8c9d2..b6d41c7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -156,6 +156,8 @@ do_subst = sed \
   -e 's|@address@hidden|$(GNU_FFLAGS)|g' \
   -e 's|@address@hidden|$(GNU_FC)|g' \
   -e 's|@address@hidden|$(GNU_FCFLAGS)|g' \
+  -e 's|@address@hidden|$(GNU_GCJ)|g' \
+  -e 's|@address@hidden|$(GNU_GCJFLAGS)|g' \
   -e 's|@address@hidden|$(YACC)|g' \
   -e 's|@address@hidden|$(LEX)|g' \
   -e 's|@address@hidden|$(TEX)|g' \
diff --git a/tests/defs-static.in b/tests/defs-static.in
index 6f79fe2..80cd1fe 100644
--- 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


hooks/post-receive
-- 
GNU Automake