From 6b82e90d7c8ef4bb2c341d5053d949cac140b096 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 7 Nov 2020 18:04:02 -0800 Subject: [PATCH] tests: recompute dependencies when lists-of-tests.mk changes. This change fixes https://bugs.gnu.org/44458 and updates https://bugs.gnu.org/11347. * t/local.mk ($(srcdir)/%D/testsuite-part.am): restore dependency on '%D/list-of-tests.mk' (i.e., t/list-of-tests.mk), partially reverting the change of 26 Apr 2012 for bug#11347. Otherwise, new tests that have dependencies will not cause an update of testsuite-part.am, leading to strange failures (bug#44458). The original problem being fixed in #11347 was unnecessary rebuilding when modifying tests; that should not be affected here, but when new tests are added, it seems reasonable, as well as necessary, to ensure dependencies are updated. --- t/local.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/local.mk b/t/local.mk index bd1615e..51fd864 100644 --- a/t/local.mk +++ b/t/local.mk @@ -91,12 +91,13 @@ $(srcdir)/%D%/testsuite-part.am: $(AM_V_at)mv -f %D%/testsuite-part.tmp $@ EXTRA_DIST += gen-testsuite-part -# The dependecies declared here are not truly complete, but such +# The dependencies declared here are not truly complete, but such # completeness would cause more issues than it would solve. See -# automake bug#11347. +# automake bug#11347 and #44458. $(generated_TESTS): $(srcdir)/gen-testsuite-part $(srcdir)/%D%/testsuite-part.am: $(srcdir)/gen-testsuite-part $(srcdir)/%D%/testsuite-part.am: Makefile.am +$(srcdir)/%D%/testsuite-part.am: %D%/list-of-tests.mk # Hand-written tests for stuff in 'contrib/'. include $(srcdir)/contrib/%D%/local.mk -- 1.8.3.1