From 857f595ed5293a9dae42ef64062461ee35547663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Sun, 28 Jun 2015 23:08:01 +0200 Subject: Bundle the package index directly inside erlang.mk If you were using the index file as a "lock file", bear with me for a moment, equivalent functionality will soon be added. :-) --- test/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'test/Makefile') diff --git a/test/Makefile b/test/Makefile index 4c26895..0de1b17 100644 --- a/test/Makefile +++ b/test/Makefile @@ -232,7 +232,6 @@ pkg-$(1): pkg-$(1)-clean pkg-$(1)-app1 "DEPS = $(1)" \ "include erlang.mk" \ > app1/Makefile - cp ../packages.v2.tsv app1/.erlang.mk.packages.v2 $t \ if [ "$(1)" = "amqp_client" ]; then \ virtualenv -p python2.7 --distribute temp-python; \ @@ -279,9 +278,11 @@ pkg-$(1): pkg-$(1)-clean pkg-$(1)-app1 fi endef -$(foreach pkg,$(shell awk '{print $$1}' ../packages.v2.tsv),$(eval $(call pkg_test_target,$(pkg)))) +PACKAGES = $(foreach pkg,$(sort $(wildcard ../index/*.mk)),$(notdir $(basename $(pkg)))) -pkgs: $(foreach pkg,$(shell awk '{print $$1}' ../packages.v2.tsv),pkg-$(pkg)) +$(foreach pkg,$(PACKAGES),$(eval $(call pkg_test_target,$(pkg)))) + +pkgs: $(addprefix pkg-,$(PACKAGES)) @if [ -f pkgs.log ]; then \ echo "+-------------------------------+"; \ echo "| ERRORS WHILE TESTING PACKAGES |"; \ -- cgit v1.2.3