From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 15 Apr 2012 19:38:03 +0000 (+0200)
Subject: [ng] parallel-tests: remove workarounds required by Solaris xpg4 make
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52ea488d39541b4d3b6618464caf4493878ba3f0;p=thirdparty%2Fautomake.git

[ng] parallel-tests: remove workarounds required by Solaris xpg4 make

* lib/am/check.am (check-TESTS, recheck): Simplify by not bothering to
work around a bug of Solaris xpg4 make that is not shared by GNU make.

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

diff --git a/lib/am/check.am b/lib/am/check.am
index 1587c5e90..abdbd01a0 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -323,22 +323,8 @@ check-TESTS recheck:
 	    grep "^$$ws*:recheck:$$ws*no$$ws*$$" $$i.trs \
 	      >/dev/null 2>&1 && continue; \
 	  else :; fi; \
-## Be careful to avoid extra whitespace in the definition of $list, since
-## its value will be passed to the recursive make invocation below through
-## the TEST_LOGS macro, and leading/trailing white space in a make macro
-## definition can be problematic.  In this particular case, trailing white
-## space was known to cause a segmentation fault on Solaris 10 XPG4 make:
-## <http://lists.gnu.org/archive/html/bug-automake/2010-08/msg00004.html>
-	  if test -z "$$log_list"; then \
-	    log_list="$$i.log"; \
-	  else \
-	    log_list="$$log_list $$i.log"; \
-	  fi; \
-	  if test -z "$$trs_list"; then \
-	    trs_list="$$i.trs"; \
-	  else \
-	    trs_list="$$trs_list $$i.trs"; \
-	  fi; \
+	  log_list="$$log_list $$i.log"; \
+	  trs_list="$$trs_list $$i.trs"; \
 	done; \
 ## Under "make recheck", remove the .log and .trs files associated
 ## with the files to recheck, so that those will be rerun by the