From d80984c1036ea81eb1f44b8d7cde85fc09b5e3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Fri, 26 Mar 2021 15:12:38 +0100 Subject: core/deps.mk: Support Rebar lock files with version "1.2.0" This is the case in erlang-systemd [1]. As far as I can tell, the format is the same for the bits Erlang.mk is interested in. The testsuite is expanded to use version 0.6.0 of erlang-systemd. [1] https://github.com/rabbitmq/erlang-systemd --- test/core_deps.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'test/core_deps.mk') diff --git a/test/core_deps.mk b/test/core_deps.mk index 973ff5d..5b46000 100644 --- a/test/core_deps.mk +++ b/test/core_deps.mk @@ -600,7 +600,7 @@ core-deps-fetch-hex: init $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v $i "Add Cowboy 1.0.0 to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy = hex 1.0.0\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy systemd\ndep_cowboy = hex 1.0.0\ndep_systemd = hex 0.6.0\n"}' $(APP)/Makefile ifdef LEGACY $i "Add Cowboy to the applications key in the .app.src file" @@ -614,13 +614,17 @@ endif $t test -d $(APP)/deps/cowboy $t test -d $(APP)/deps/cowlib $t test -d $(APP)/deps/ranch + $t test -d $(APP)/deps/systemd + $t test -d $(APP)/deps/enough $i "Check that the application was compiled correctly" $t $(ERL) -pa $(APP)/ebin/ $(APP)/deps/*/ebin/ -eval " \ - [ok = application:load(App) || App <- [$(APP), cowboy, cowlib, ranch]], \ + [ok = application:load(App) || App <- [$(APP), cowboy, cowlib, ranch, systemd, enough]], \ {ok, Deps} = application:get_key($(APP), applications), \ true = lists:member(cowboy, Deps), \ + true = lists:member(systemd, Deps), \ {ok, \"1.0.0\"} = application:get_key(cowboy, vsn), \ + {ok, \"0.6.0\"} = application:get_key(systemd, vsn), \ halt()" # @todo Enable this test again when a host provides Mercurial again. -- cgit v1.2.3