[ng] parallel-tests: define $(TEST_SUITE_LOG) in makefile fragment

* lib/am/parallel-tests.am: Here (unless already defined) ...
* automake.in (handle_tests): ... rather than here.

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

diff --git a/automake.in b/automake.in
index 3d09cc28311e706d82fed5ca3b73f25c52bbfb07..cb3bd665c6fce54eaea46ecd422a3a2b4de8afdc 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -4109,7 +4109,6 @@ sub handle_tests
         }
       else
         {
-         define_variable ('TEST_SUITE_LOG', INTERNAL, 'test-suite.log');
           require_conf_file ("parallel-tests", FOREIGN, 'test-driver');
           almost_verbatim ('parallel-tests', 'CHECK-DEPS' => "@check");
        }

diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index 3ad7de6217990a0559cbd79752aac06caa773003..116d178257853f7edd641a949352c3b0dd28f953 100644 (file)
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -309,6 +309,10 @@ define am.setup-test-harness-workdir
          && sed 's/$$/.trs/' $$workdir/bases > $$workdir/trs
 endef
 
+ifeq ($(call am.vars.is-undef,TEST_SUITE_LOG),yes)
+  TEST_SUITE_LOG = test-suite.log
+endif
+
 $(TEST_SUITE_LOG): $(am.test-suite.test-logs) $(am.test-suite.test-results)
        $(am.setup-test-harness-workdir)
        @set +e; $(am.test-suite.tty-colors); \