From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 22 Dec 2014 20:34:36 +0000 (+0100)
Subject: [ng] parallel-tests: improve detection of circular dependencies
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7db2b5cb7da80935fd700d437d058a23e84b3b6;p=thirdparty%2Fautomake.git

[ng] parallel-tests: improve detection of circular dependencies

* lib/am/parallel-tests.mk (am.test-suite.runtest): Here.
($(TEST_SUITE_LOG)): Drop redundant and non-workinf code.

Fixes a long-standing failure in test 't/parallel-tests-fork-bomb.sh'.

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

diff --git a/lib/am/parallel-tests.mk b/lib/am/parallel-tests.mk
index 06f949f72..c1fb69f16 100644
--- a/lib/am/parallel-tests.mk
+++ b/lib/am/parallel-tests.mk
@@ -32,6 +32,10 @@ am.test-suite.is-xfail = \
 
 am.test-suite.runtest = \
   $(am.test-suite.tty-colors);						\
+  if test '$(TEST_SUITE_LOG)' = '$*.log'; then				\
+    echo "fatal: $*.log: depends on itself (check TESTS content)" >&2;	\
+    exit 1;								\
+  fi;									\
   srcdir=$(srcdir); export srcdir;					\
 ## Creates the directory for the log file if needed.  Avoid extra forks.
   test x$(@D) = x. || test -d $(@D) || $(MKDIR_P) $(@D) || exit $$?;	\
@@ -318,9 +322,6 @@ $(TEST_SUITE_LOG): $(am.test-suite.test-logs) $(am.test-suite.test-results)
 	@set +e; $(am.test-suite.tty-colors); \
 	fatal () { echo "fatal: making $@: $$*" >&2; exit 1; }; \
 	workdir='$(am.test-suite.workdir)'; \
-## Detect a possible circular dependency, and error out if it's found.
-	grep '^$(TEST_SUITE_LOG:.log=)$$' $$workdir/bases \
-	  && fatal "depends on itself (check TESTS content)"; \
 ## Prepare data for the test suite summary.  These do not take into account
 ## unreadable test results, but they'll be appropriately updated later if
 ## needed.