diff options
| author | Loïc Hoguin <[email protected]> | 2015-10-22 12:33:29 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-10-22 12:33:29 +0200 |
| commit | d07357f52ad8a0b67aef6d95506bb2df0a068ad3 (patch) | |
| tree | 3fdd6bd860f958dca5e8e979de8454a7a4cc7bad /test/core_deps.mk | |
| parent | 8d49f08a11da8314cd999f9a03af62ef018595c4 (diff) | |
| parent | 6f6d7696e56237a494af3decb00cee83c735c429 (diff) | |
| download | erlang.mk-d07357f52ad8a0b67aef6d95506bb2df0a068ad3.tar.gz erlang.mk-d07357f52ad8a0b67aef6d95506bb2df0a068ad3.tar.bz2 erlang.mk-d07357f52ad8a0b67aef6d95506bb2df0a068ad3.zip | |
Merge branch 'fix-test-core-plugins-one' of https://github.com/rabbitmq/erlang.mk
Diffstat (limited to 'test/core_deps.mk')
| -rw-r--r-- | test/core_deps.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/core_deps.mk b/test/core_deps.mk index dfeb328..f986ea8 100644 --- a/test/core_deps.mk +++ b/test/core_deps.mk @@ -127,7 +127,7 @@ core-deps-apps-conflict: build clean-core-deps-apps-conflict $t $(MAKE) -C $(APP) new-lib in=cowlib $v $i "Check that building the application fails because of a conflict" - $t if $(MAKE) -C $(APP) $v; then false; fi + $t ! $(MAKE) -C $(APP) $v $i "Check that Cowlib wasn't fetched" $t test ! -e $(APP)/deps/cowlib @@ -146,7 +146,7 @@ core-deps-apps-deep-conflict: build clean-core-deps-apps-deep-conflict $t $(MAKE) -C $(APP) new-lib in=cowlib $v $i "Check that building the application fails because of a conflict" - $t if $(MAKE) -C $(APP) $v; then false; fi + $t ! $(MAKE) -C $(APP) $v $i "Check that Cowlib wasn't fetched" $t test ! -e $(APP)/deps/cowlib @@ -664,7 +664,7 @@ core-deps-fetch-fail-bad: build clean-core-deps-fetch-fail-bad $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\ndep_cowlib = oops https://github.com/ninenines/cowlib 1.0.0\n"}' $(APP)/Makefile $i "Check that building the application fails" - $t if $(MAKE) -C $(APP) $v; then false; fi + $t ! $(MAKE) -C $(APP) $v core-deps-fetch-fail-unknown: build clean-core-deps-fetch-fail-unknown @@ -677,7 +677,7 @@ core-deps-fetch-fail-unknown: build clean-core-deps-fetch-fail-unknown $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = unknown\n"}' $(APP)/Makefile $i "Check that building the application fails" - $t if $(MAKE) -C $(APP) $v; then false; fi + $t ! $(MAKE) -C $(APP) $v core-deps-fetch-git: build clean-core-deps-fetch-git @@ -782,7 +782,7 @@ core-deps-fetch-legacy: build clean-core-deps-fetch-legacy $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\ndep_cowlib = https://github.com/ninenines/cowlib 1.0.0\n"}' $(APP)/Makefile $i "Check that building the application fails" - $t if $(MAKE) -C $(APP) $v; then false; fi + $t ! $(MAKE) -C $(APP) $v $i "Check that building the application works with IS_DEP=1" $t $(MAKE) -C $(APP) IS_DEP=1 $v |