From: Bruno Haible Date: Mon, 22 Jul 2024 13:05:30 +0000 (+0200) Subject: gnulib-tool: Omit the logs of skipped tests from test-suite.log. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=beb4e55021ff436399a81010ad34fa403c837e6b;p=gnulib.git 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/ChangeLog b/ChangeLog index 222eb9581b..335a29b0c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-07-22 Bruno Haible + + 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. + 2024-07-21 Bruno Haible bootstrap: Avoid failure when gnulib-tool removed gettext.m4. 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 @@ AC_DEFUN([%V1%_LIBSOURCES], [ # 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)