diff options
| author | Stanislav Ovchar <[email protected]> | 2017-03-17 20:16:59 +0300 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2017-05-25 11:28:45 +0200 |
| commit | 1a88ca7d11ecfbb30224e2e911743064faad5408 (patch) | |
| tree | f76880613f9c51a7ca52267099c92ad4b1c4c9ca | |
| parent | ef46b3e863b3d4a9be2a50b626e8da799e707b70 (diff) | |
| download | erlang.mk-1a88ca7d11ecfbb30224e2e911743064faad5408.tar.gz erlang.mk-1a88ca7d11ecfbb30224e2e911743064faad5408.tar.bz2 erlang.mk-1a88ca7d11ecfbb30224e2e911743064faad5408.zip | |
Update relx up to v3.23.0
| -rw-r--r-- | plugins/relx.mk | 2 | ||||
| -rw-r--r-- | test/plugin_relx.mk | 45 |
2 files changed, 38 insertions, 9 deletions
diff --git a/plugins/relx.mk b/plugins/relx.mk index ab0e7c6..9b983f9 100644 --- a/plugins/relx.mk +++ b/plugins/relx.mk @@ -8,7 +8,7 @@ RELX ?= $(ERLANG_MK_TMP)/relx RELX_CONFIG ?= $(CURDIR)/relx.config -RELX_URL ?= https://github.com/erlware/relx/releases/download/v3.19.0/relx +RELX_URL ?= https://github.com/erlware/relx/releases/download/v3.23.0/relx RELX_OPTS ?= RELX_OUTPUT_DIR ?= _rel RELX_REL_EXT ?= diff --git a/test/plugin_relx.mk b/test/plugin_relx.mk index ad29669..39c5893 100644 --- a/test/plugin_relx.mk +++ b/test/plugin_relx.mk @@ -114,29 +114,58 @@ else $t test `$(APP)/tmp/bin/$(APP)_release rpcterms test test` = old endif - $i "Move the relup tarball to the release directory" + $i "Check that it's 1 avalible version" +ifeq ($(PLATFORM),msys2) + $t test `$(APP)/tmp/bin/$(APP)_release.cmd versions |wc -l` = "2" +else + $t test `$(APP)/tmp/bin/$(APP)_release versions |wc -l` = "2" +endif + + $i "Copy the relup tarball to the release directory" $t mkdir $(APP)/tmp/releases/2 - $t mv $(APP)/_rel/$(APP)_release/$(APP)_release-2.tar.gz $(APP)/tmp/releases/2/$(APP)_release.tar.gz + $t cp $(APP)/_rel/$(APP)_release/$(APP)_release-2.tar.gz $(APP)/tmp/releases/2/$(APP)_release.tar.gz + $t test -f $(APP)/tmp/releases/2/$(APP)_release.tar.gz $i "Upgrade the release and confirm it runs the new code" ifeq ($(PLATFORM),msys2) - $t $(APP)/tmp/bin/$(APP)_release.cmd upgrade "2/$(APP)_release" $v + $t $(APP)/tmp/bin/$(APP)_release.cmd upgrade "2" $t sleep 1 $t test `$(APP)/tmp/bin/$(APP)_release.cmd rpcterms test test` = new - - $i "Stop the release" - $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release.cmd stop $v - $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release.cmd uninstall $v else $i "Upgrade running release" - $t $(APP)/tmp/bin/$(APP)_release upgrade "2/$(APP)_release" $v + $t $(APP)/tmp/bin/$(APP)_release upgrade "2" $t sleep 1 $t test `$(APP)/tmp/bin/$(APP)_release rpcterms test test` = new +endif + + $i "Check that it's 2 avalible versions" +ifeq ($(PLATFORM),msys2) + $t test `$(APP)/tmp/bin/$(APP)_release.cmd versions |wc -l` = "3" +else + $t test `$(APP)/tmp/bin/$(APP)_release versions |wc -l` = "3" +endif + + $i "Downgrade the release and confirm it runs the old code" +ifeq ($(PLATFORM),msys2) + $t $(APP)/tmp/bin/$(APP)_release.cmd downgrade "1" + $t sleep 1 + $t test `$(APP)/tmp/bin/$(APP)_release.cmd rpcterms test test` = old +else + $i "Downgrade running release" + $t $(APP)/tmp/bin/$(APP)_release downgrade "1" + $t sleep 1 + $t test `$(APP)/tmp/bin/$(APP)_release rpcterms test test` = old +endif $i "Stop the release" +ifeq ($(PLATFORM),msys2) + $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release.cmd stop $v + $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release.cmd uninstall $v +else $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release stop $v endif + relx-start-stop: build clean $i "Bootstrap a new release named $(APP)" |