From a3cd50792d0ed1c5dfee66ff79ee7117057e9970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Fri, 7 Dec 2018 19:40:02 +0100 Subject: Autopatch: allow configuring REBAR_GIT and REBAR_COMMIT And use this in the tests to fetch Rebar only once and then clone from the local repository. This should speed up tests a little. --- test/core_autopatch.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'test/core_autopatch.mk') diff --git a/test/core_autopatch.mk b/test/core_autopatch.mk index 21fad4b..e9364b8 100644 --- a/test/core_autopatch.mk +++ b/test/core_autopatch.mk @@ -6,7 +6,7 @@ CORE_AUTOPATCH_TARGETS = $(call list_targets,core-autopatch) core-autopatch: $(CORE_AUTOPATCH_TARGETS) -core-autopatch-extended: build clean +core-autopatch-extended: init $i "Bootstrap a new OTP library named $(APP)" $t mkdir $(APP)/ @@ -26,7 +26,7 @@ core-autopatch-extended: build clean $t ! test -e $(APP)/deps/ranch/src/ranch_protocol.erl $t ! test -e $(APP)/deps/ranch/ebin/ranch_protocol.beam -core-autopatch-extended-erlc-opts: build clean +core-autopatch-extended-erlc-opts: init $i "Bootstrap a new OTP library named $(APP)" $t mkdir $(APP)/ @@ -45,7 +45,7 @@ core-autopatch-extended-erlc-opts: build clean $i "Check that couchbeam_ejson was compiled with the added option" $t $(ERL) -pa $(APP)/deps/couchbeam/ebin -eval 'c:m(couchbeam_ejson), halt()' | grep -c "WITH_JIFFY" | grep -q 1 -core-autopatch-no-autopatch: build clean +core-autopatch-no-autopatch: init $i "Bootstrap a new OTP library named $(APP)" $t mkdir $(APP)/ @@ -66,7 +66,7 @@ core-autopatch-no-autopatch: build clean $i "Check that Cowlib was not autopatched" $t grep -q Hoguin $(APP)/deps/cowlib/erlang.mk -core-autopatch-no-autopatch-erlang-mk: build clean +core-autopatch-no-autopatch-erlang-mk: init $i "Bootstrap a new OTP library named $(APP)" $t mkdir $(APP)/ @@ -85,7 +85,7 @@ core-autopatch-no-autopatch-erlang-mk: build clean $i "Check that Erlang.mk was not autopatched" $t grep -q Hoguin $(APP)/deps/cowlib/erlang.mk -core-autopatch-no-autopatch-rebar: build clean +core-autopatch-no-autopatch-rebar: init $i "Bootstrap a new OTP library named $(APP)" $t mkdir $(APP)/ @@ -106,7 +106,7 @@ core-autopatch-no-autopatch-rebar: build clean $t if grep -q erlang\.mk $(APP)/deps/goldrush/Makefile; then false; fi $t if grep -q erlang\.mk $(APP)/deps/lager/Makefile; then false; fi -core-autopatch-port_env: build clean +core-autopatch-port_env: init $i "Bootstrap a new OTP library named $(APP)" $t mkdir $(APP)/ @@ -143,7 +143,7 @@ endif $i "Confirm that the port_env configuration was expanded properly" $t grep -q "shell pkg-config" $(APP)/deps/my_dep/c_src/Makefile.erlang.mk -core-autopatch-rebar: build clean +core-autopatch-rebar: init $i "Bootstrap a new OTP library named $(APP)" $t mkdir $(APP)/ @@ -164,7 +164,7 @@ ifneq ($(PLATFORM),msys2) endif # This test is expected to fail when run in parallel and flock/lockf is not available. -core-autopatch-two-rebar: build clean +core-autopatch-two-rebar: init $i "Bootstrap a new OTP library named $(APP)" $t mkdir $(APP)/ -- cgit v1.2.3