When looking at the test-suite.log of a directory with gnulib tests (whether from a testdir or included in a GNU package), the skipped tests in this log files are more annoying than useful.
This patch omits the logs of the skipped tests, assuming Automake ≥ 1.17 is in use. It has no effect with Automake < 1.17. It makes use of a new feature in Automake 1.17 [1]. [1] https://lists.gnu.org/archive/html/bug-automake/2024-06/msg00003.html 2024-07-22 Bruno Haible <br...@clisp.org> gnulib-tool: Omit the logs of skipped tests from test-suite.log. * gnulib-tool.sh (func_emit_tests_Makefile_am): Emit an assignment to IGNORE_SKIPPED_LOGS. * pygnulib/GLEmiter.py (GLEmiter.tests_Makefile_am): Likewise. diff --git a/gnulib-tool.sh b/gnulib-tool.sh index 12f0b82461..0efc25f0dc 100755 --- a/gnulib-tool.sh +++ b/gnulib-tool.sh @@ -4438,6 +4438,8 @@ func_emit_tests_Makefile_am () # EXEEXT is defined by AC_PROG_CC through autoconf. # srcdir is defined by autoconf and automake. echo "TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='\$(srcdir)'" + # Omit logs of skipped tests from test-suite.log, if Automake ≥ 1.17 is used. + echo "IGNORE_SKIPPED_LOGS = 1" echo cat "$tmp"/main_snippets "$tmp"/longrunning_snippets \ | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index cb6106e941..7eb8b27d46 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -1216,7 +1216,9 @@ def tests_Makefile_am(self, destfile: str, modules: list[GLModule], moduletable: # Many test scripts use ${EXEEXT} or ${srcdir}. # EXEEXT is defined by AC_PROG_CC through autoconf. # srcdir is defined by autoconf and automake. - emit += "TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'\n\n" + emit += "TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'\n" + # Omit logs of skipped tests from test-suite.log, if Automake ≥ 1.17 is used. + emit += 'IGNORE_SKIPPED_LOGS = 1\n\n' all_snippets = main_snippets + longrun_snippets all_snippets = all_snippets.replace('$(top_srcdir)/build-aux/', '$(top_srcdir)/%s/' % auxdir)
