[ng] fixup: don't reference non-existing tests on 'multilib'

* contrib/t/local.am (contrib_TESTS): Here.
* Makefile.am (EXTRA_DIST): No need to manually add $(contrib_TESTS),
we already add $(TESTS) as a whole.
(TESTS): Add $(contrib_TESTS) directly in the definition, rather than
later with '+='.
($(srcdir)/contrib/t/local.am): Move inclusion of this earlier.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 0ac2338c945dccbc470738d22e5cad69e3317fd1..6b8cde9b3de4cf6c3ab75c5b1aee9d64090c7216 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -296,6 +296,9 @@ AM_TAP_LOG_DRIVER_FLAGS = --merge
 
 EXTRA_DIST += t/README t/ax/is t/ax/is_newest
 
+# Hand-written tests for stuff in 'contrib/'.
+include $(srcdir)/contrib/t/local.am
+
 # All tests, both hand-written and autogenerated.
 # IMPORTANT: This assumes that the autogenerated tests are placed
 #            in the $(srcdir) as well!
@@ -318,7 +321,8 @@ long_running_TESTS = \
 
 TESTS = \
   $(long_running_TESTS) \
-  $(filter-out $(long_running_TESTS), $(all_TESTS))
+  $(filter-out $(long_running_TESTS), $(all_TESTS)) \
+  $(contrib_TESTS)
 
 EXTRA_DIST += $(TESTS)
 
@@ -391,11 +395,6 @@ $(srcdir)/testsuite-autodeps.am: $(srcdir)/gen-testsuite-part
        $(AM_V_at)chmod a-w $(@F)-t && mv -f $(@F)-t $@
 EXTRA_DIST += gen-testsuite-part
 
-# Hand-written tests for stuff in 'contrib/'.
-include $(srcdir)/contrib/t/local.am
-TESTS += $(contrib_TESTS)
-EXTRA_DIST += $(contrib_TESTS)
-
 # Static dependencies valid for each test case.
 check_SCRIPTS = t/wrap/aclocal-$(APIVERSION) t/wrap/automake-$(APIVERSION)
 dist_check_DATA = \

diff --git a/contrib/t/local.am b/contrib/t/local.am
index 3859c70c7389195d7283bfad3c23338dd1a62f4e..185274797aa8b34595ee1429099b03e98b29e4d2 100644 (file)
--- a/contrib/t/local.am
+++ b/contrib/t/local.am
@@ -20,6 +20,4 @@ contrib_testsuite_dir = contrib/t
 
 contrib_TESTS = \
   $(contrib_testsuite_dir)/parallel-tests-html.sh \
-  $(contrib_testsuite_dir)/parallel-tests-html-recursive.sh \
-  $(contrib_testsuite_dir)/help-multilib.sh \
-  $(contrib_testsuite_dir)/multilib.sh
+  $(contrib_testsuite_dir)/parallel-tests-html-recursive.sh