Stefano Lattarini wrote: ... > The patch is OK, of course. Extra kudos if you add a reference in the > commit message to the commit where I broke the tests.
Hi Stefano, Thanks for the explanation. Here you go: [BTW, if you like gitk's highlighting of SHA1 strings in logs, and compile your own version of git once in a while, you might want to carry this git patch: http://marc.info/?t=132352993500001&r=1&w=2 It makes gitk also highlight the SHA1 part of more descriptive strings like v1.11-2019-g4d2bf42 below. This shows what it looks like: http://meyering.net/code/gitk/gitk-highlight-git-describe-SHA1.jpg ] >From 9888205813e24281527448d408b2e4e5075e2026 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyer...@redhat.com> Date: Sat, 25 Feb 2012 12:37:25 +0100 Subject: [PATCH] tests: avoid spurious failure 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. Introduced via the previous commit, v1.11-2019-g4d2bf42. --- tests/Makefile.am | 2 ++ tests/defs-static.in | 2 ++ 2 files changed, 4 insertions(+) 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|@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 --- 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 -- 1.7.9.2.263.g9be8b7
