From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 15 Apr 2012 10:02:47 +0000 (+0200)
Subject: [ng] parallel-tests: remove workaround for BSD make
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb31e232cb75989c1c7cc8cdb91c10954bbb3333;p=thirdparty%2Fautomake.git

[ng] parallel-tests: remove workaround for BSD make

When BSD make is run in parallel mode, it apparently strips any
leading directory component from the automatic variable '$*' (of
course, against what POSIX mandates).  In order to avoid this
behaviour from breaking the parallel-tests driver, we added an
hacky workaround in commit v1.11-1982-ge1606b3 of 18-02-2012.
Now that we assume GNU make, this workaround is not needed anymore,
so let's remove it.

* lib/check2.am (am__set_b): Remove its definition and its uses.

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

diff --git a/lib/am/check2.am b/lib/am/check2.am
index 9847a449f..a14e775cd 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -14,32 +14,11 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if %?FIRST%
-## When BSD make is run in parallel mode, it apparently strips any
-## leading directory component from the automatic variable '$*' (of
-## course, against what POSIX mandates).  Try to detect and work
-## around this incompatibility.
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-endif %?FIRST%
-
 ## From a test file to a .log and .trs file.
 ?GENERIC?%EXT%.log:
 ?!GENERIC?%OBJ%: %SOURCE%
-	@p='%SOURCE%'; \
-## Another hack to support BSD make in parallel mode.
-?!GENERIC?	b='%BASE%'; \
-?GENERIC?	$(am__set_b); \
-	$(am__check_pre) %DRIVER% --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
+	@p='%SOURCE%'; $(am__check_pre) %DRIVER% --test-name "$$f" \
+	--log-file '%BASE%.log' --trs-file '%BASE%.trs' \
 	$(am__common_driver_flags) %DRIVER_FLAGS% -- %COMPILE% \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
@@ -49,12 +28,8 @@ endif %?FIRST%
 ## conflict with the previous one.
 if %am__EXEEXT%
 ?GENERIC?%EXT%$(EXEEXT).log:
-	@p='%SOURCE%'; \
-	## Another hack to support BSD make in parallel mode.
-?!GENERIC?	b='%BASE%'; \
-?GENERIC?	$(am__set_b); \
-	$(am__check_pre) %DRIVER% --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
+	@p='%SOURCE%'; $(am__check_pre) %DRIVER% --test-name "$$f" \
+	--log-file '%BASE%.log' --trs-file '%BASE%.trs' \
 	$(am__common_driver_flags) %DRIVER_FLAGS% -- %COMPILE% \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 endif %am__EXEEXT%