From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 30 Jul 2012 08:03:58 +0000 (+0200)
Subject: [ng] parallel-tests: define $(TEST_SUITE_LOG) in makefile fragment
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47dfbb43195e90edf199c10a91fa7a497eb63c5a;p=thirdparty%2Fautomake.git

[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 3d09cc283..cb3bd665c 100644
--- 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 3ad7de621..116d17825 100644
--- 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); \