[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-ng] [PATCH 1/4] [ng] parallel-tests: remove workaround for BSD
From: |
Stefano Lattarini |
Subject: |
[Automake-ng] [PATCH 1/4] [ng] parallel-tests: remove workaround for BSD make |
Date: |
Sun, 15 Apr 2012 21:55:12 +0200 |
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 usages.
Signed-off-by: Stefano Lattarini <address@hidden>
---
lib/am/check2.am | 33 ++++-----------------------------
1 file changed, 4 insertions(+), 29 deletions(-)
diff --git a/lib/am/check2.am b/lib/am/check2.am
index 9847a44..a14e775 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%
--
1.7.9.5