diff options
| author | Krzysztof Jurewicz <[email protected]> | 2018-02-11 10:51:34 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2018-03-14 17:48:47 +0100 |
| commit | 30f851d1f1d48d30d3b42df32acb6bb980d2a95d (patch) | |
| tree | 80e5c1d692458edf4f60d6783ae6ea4377ca1a65 | |
| parent | 4fbc1ff227e8d9b8a59cb922d9d9fd8987476ec8 (diff) | |
| download | erlang.mk-30f851d1f1d48d30d3b42df32acb6bb980d2a95d.tar.gz erlang.mk-30f851d1f1d48d30d3b42df32acb6bb980d2a95d.tar.bz2 erlang.mk-30f851d1f1d48d30d3b42df32acb6bb980d2a95d.zip | |
Create temporary directory when generating relx
| -rw-r--r-- | plugins/relx.mk | 1 | ||||
| -rw-r--r-- | test/plugin_relx.mk | 23 |
2 files changed, 23 insertions, 1 deletions
diff --git a/plugins/relx.mk b/plugins/relx.mk index 267d899..d276219 100644 --- a/plugins/relx.mk +++ b/plugins/relx.mk @@ -39,6 +39,7 @@ distclean:: distclean-relx-rel # Plugin-specific targets. $(RELX): + $(verbose) mkdir -p $(ERLANG_MK_TMP) $(gen_verbose) $(call core_http_get,$(RELX),$(RELX_URL)) $(verbose) chmod +x $(RELX) diff --git a/test/plugin_relx.mk b/test/plugin_relx.mk index 4124b7a..9970f99 100644 --- a/test/plugin_relx.mk +++ b/test/plugin_relx.mk @@ -3,7 +3,7 @@ # Sleeps when interacting with relx script are necessary after start and upgrade # as both of those interactions are not synchronized. -RELX_CASES = rel relup start-stop tar vsn +RELX_CASES = rel bare-rel relup start-stop tar vsn RELX_TARGETS = $(addprefix relx-,$(RELX_CASES)) .PHONY: relx $(RELX_TARGETS) @@ -54,6 +54,27 @@ relx-rel: build clean $i "Check that the output directory was removed entirely" $t test ! -d $(APP)/_rel/ +relx-bare-rel: build clean + + $i "Bootstrap a new release named $(APP)" + $t mkdir $(APP)/ + $t cp ../erlang.mk $(APP)/ + $t $(MAKE) -C $(APP) -f erlang.mk bootstrap bootstrap-rel $v + + $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 + $t test -d $(APP)/_rel/$(APP)_release/bin + $t test -d $(APP)/_rel/$(APP)_release/lib + $t test -d $(APP)/_rel/$(APP)_release/releases + $t test -d $(APP)/_rel/$(APP)_release/releases/1 + relx-relup: build clean $i "Bootstrap a new release named $(APP)" |