From 3e83513764e8205d67b12346206d8c2fa0e5eed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Wed, 27 Apr 2022 17:02:52 +0200 Subject: Upgrade to Relx 4 which is now used as a library --- test/plugin_relx.mk | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) (limited to 'test') diff --git a/test/plugin_relx.mk b/test/plugin_relx.mk index 2771e8f..58298af 100644 --- a/test/plugin_relx.mk +++ b/test/plugin_relx.mk @@ -22,12 +22,12 @@ relx-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 "Build the release" $t $(MAKE) -C $(APP) $v - $i "Check that relx was downloaded" - $t test -f $(APP)/.erlang.mk/relx - $i "Check that the release was built" $t test -d $(APP)/_rel $t test -d $(APP)/_rel/$(APP)_release @@ -60,6 +60,9 @@ relx-apps-with-deps: init $t cp ../erlang.mk $(APP)/ $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib 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 "Create a new application my_app" $t $(MAKE) -C $(APP) new-app in=my_app $v @@ -94,12 +97,12 @@ relx-bare-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 "Build the release" $t $(MAKE) -C $(APP) rel $v - $i "Check that relx was downloaded" - $t test -f $(APP)/.erlang.mk/relx - $i "Check that the release was built" $t test -d $(APP)/_rel $t test -d $(APP)/_rel/$(APP)_release @@ -115,6 +118,9 @@ relx-post-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 "Add relx-post-rel target to Makefile" $t echo "relx-post-rel::" >> $(APP)/Makefile $t echo " echo test post rel > _rel/$(APP)_release/test_post_rel" >> $(APP)/Makefile @@ -122,9 +128,6 @@ relx-post-rel: init $i "Build the release" $t $(MAKE) -C $(APP) $v - $i "Check that relx was downloaded" - $t test -f $(APP)/.erlang.mk/relx - $i "Check that the release was built" $t test -d $(APP)/_rel $t test -d $(APP)/_rel/$(APP)_release @@ -165,6 +168,9 @@ relx-relup: 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 "Set the initial application version" ifeq ($(LEGACY),1) $t sed -i.bak s/"{vsn, \"0.1.0\"}"/"{vsn, \"1\"}"/ $(APP)/src/$(APP).app.src @@ -218,11 +224,11 @@ ifeq ($(PLATFORM),msys2) else $i "Start initial release and confirm it runs the old code" endif - $t $(APP)/tmp/bin/$(APP)_release$(RELX_REL_EXT) start + $t $(APP)/tmp/bin/$(APP)_release$(RELX_REL_EXT) daemon $t sleep 1 ifneq ($(PLATFORM),msys2) -# On Windows the script does not have the commands rpcterms and versions. - $t test `$(APP)/tmp/bin/$(APP)_release$(RELX_REL_EXT) rpcterms test test` = old +# On Windows the script does not have the commands rpc and versions. + $t test `$(APP)/tmp/bin/$(APP)_release$(RELX_REL_EXT) rpc test test` = old $i "Check that it's 1 available version" $t test `$(APP)/tmp/bin/$(APP)_release$(RELX_REL_EXT) versions | wc -l` = "2" @@ -246,8 +252,8 @@ else endif $t sleep 1 ifneq ($(PLATFORM),msys2) -# On Windows the script does not have the commands rpcterms and versions. - $t test `$(APP)/tmp/bin/$(APP)_release$(RELX_REL_EXT) rpcterms test test` = new +# On Windows the script does not have the commands rpc and versions. + $t test `$(APP)/tmp/bin/$(APP)_release$(RELX_REL_EXT) rpc test test` = new $i "Check that it's 2 available versions" $t test `$(APP)/tmp/bin/$(APP)_release$(RELX_REL_EXT) versions | wc -l` = "3" @@ -266,8 +272,8 @@ else endif $t sleep 1 ifneq ($(PLATFORM),msys2) -# On Windows the script does not have the commands rpcterms and versions. - $t test `$(APP)/tmp/bin/$(APP)_release$(RELX_REL_EXT) rpcterms test test` = old +# On Windows the script does not have the commands rpc and versions. + $t test `$(APP)/tmp/bin/$(APP)_release$(RELX_REL_EXT) rpc test test` = old endif $i "Stop the release" @@ -287,6 +293,9 @@ relx-start-stop: 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 "Build the release" $t $(MAKE) -C $(APP) $v @@ -300,7 +309,7 @@ endif ifeq ($(PLATFORM),msys2) $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release$(RELX_REL_EXT) install endif - $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release$(RELX_REL_EXT) start + $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release$(RELX_REL_EXT) daemon $i "Ping the release" $t $(call wait_for_success,$(APP)/_rel/$(APP)_release/bin/$(APP)_release$(RELX_REL_EXT) ping) @@ -329,6 +338,9 @@ relx-tar: 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 "Build the release without a tarball" $t $(MAKE) -C $(APP) RELX_TAR=0 $v @@ -348,6 +360,9 @@ relx-vsn: 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 "Replace the vsn" $t sed -i.bak s/"\"1\""/"{cmd, \"printf 2\"}"/ $(APP)/relx.config -- cgit v1.2.3