Skip to content

Commit

Permalink
gnulib-tool: Omit the logs of skipped tests from test-suite.log.
Browse files Browse the repository at this point in the history
* gnulib-tool.sh (func_emit_tests_Makefile_am): Emit an assignment to
IGNORE_SKIPPED_LOGS.
* pygnulib/GLEmiter.py (GLEmiter.tests_Makefile_am): Likewise.
  • Loading branch information
bhaible committed Jul 22, 2024
1 parent f3967bd commit beb4e55
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2024-07-22 Bruno Haible <[email protected]>

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 <[email protected]>

bootstrap: Avoid failure when gnulib-tool removed gettext.m4.
Expand Down
2 changes: 2 additions & 0 deletions gnulib-tool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 3 additions & 1 deletion pygnulib/GLEmiter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit beb4e55

Please sign in to comment.