diff options
| author | Loïc Hoguin <[email protected]> | 2022-04-28 11:46:47 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2022-04-28 11:46:47 +0200 |
| commit | 6f9ee4c52066cdbec7c809363649ab30fda22db0 (patch) | |
| tree | 8e553eeebae229e3d061f1f7b5abcc2e3b6eef0e /test | |
| parent | 3e83513764e8205d67b12346206d8c2fa0e5eed3 (diff) | |
| download | erlang.mk-6f9ee4c52066cdbec7c809363649ab30fda22db0.tar.gz erlang.mk-6f9ee4c52066cdbec7c809363649ab30fda22db0.tar.bz2 erlang.mk-6f9ee4c52066cdbec7c809363649ab30fda22db0.zip | |
fixup! Upgrade to Relx 4 which is now used as a library
Diffstat (limited to 'test')
| -rw-r--r-- | test/core_deps.mk | 10 | ||||
| -rw-r--r-- | test/plugin_bootstrap.mk | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/test/core_deps.mk b/test/core_deps.mk index 5b46000..c7778ed 100644 --- a/test/core_deps.mk +++ b/test/core_deps.mk @@ -1260,8 +1260,8 @@ core-deps-rel: init $t cp ../erlang.mk $(APP)/ $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib bootstrap-rel $v - $i "Add Recon to the list of release dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "REL_DEPS = recon\n"}' $(APP)/Makefile + $i "Add Relx and Recon to the list of release dependencies" + $t perl -ni.bak -e 'print;if ($$.==1) {print "REL_DEPS = relx recon\n"}' $(APP)/Makefile $i "Add Recon to the relx.config file" $t $(ERL) -eval " \ @@ -1302,17 +1302,17 @@ core-deps-rel: init ifeq ($(PLATFORM),msys2) # $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release.cmd install $v # $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release.cmd start $v -# $t test -n "`$(APP)/_rel/$(APP)_release/bin/$(APP)_release.cmd rpcterms \ +# $t test -n "`$(APP)/_rel/$(APP)_release/bin/$(APP)_release.cmd rpc \ # application loaded_applications | grep recon`" # $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release.cmd stop $v # $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release.cmd uninstall $v else $i "Start the release and check that Recon is loaded" - $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release start $v + $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release daemon $v $t apps="Node is not running!"; \ while test "$$apps" = "Node is not running!"; do \ apps=$$($(APP)/_rel/$(APP)_release/bin/$(APP)_release \ - rpcterms \ application loaded_applications); \ + rpc application loaded_applications); \ done; \ echo "$$apps" | grep -q recon $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release stop $v diff --git a/test/plugin_bootstrap.mk b/test/plugin_bootstrap.mk index 7093fce..251de7a 100644 --- a/test/plugin_bootstrap.mk +++ b/test/plugin_bootstrap.mk @@ -201,6 +201,9 @@ bootstrap-rel: init $t cp ../erlang.mk $(APP)/ $t $(MAKE) -C $(APP) -f erlang.mk bootstrap bootstrap-rel $v + $i "Add Relx to the list of release dependencies" + $t perl -ni.bak -e 'print;if ($$.==1) {print "REL_DEPS = relx\n"}' $(APP)/Makefile + $i "Check that all bootstrapped files exist" $t test -f $(APP)/Makefile $t test -f $(APP)/relx.config |