aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2019-06-20 22:05:52 +0200
committerLoïc Hoguin <[email protected]>2019-06-20 22:05:52 +0200
commit39d29a33416b38f5d7f78f4bc9a64d2968aaa738 (patch)
treeccb8053ba5358cd84ddfe292a570feafcf42bd93
parent643ea11a1a72ab85d7fe61d918ebf233f04bbd8d (diff)
downloaderlang.mk-39d29a33416b38f5d7f78f4bc9a64d2968aaa738.tar.gz
erlang.mk-39d29a33416b38f5d7f78f4bc9a64d2968aaa738.tar.bz2
erlang.mk-39d29a33416b38f5d7f78f4bc9a64d2968aaa738.zip
Try a fix for the relx-start-stop intermittent test failure
-rw-r--r--test/plugin_relx.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/plugin_relx.mk b/test/plugin_relx.mk
index f8d5b99..60e73cf 100644
--- a/test/plugin_relx.mk
+++ b/test/plugin_relx.mk
@@ -253,6 +253,12 @@ relx-start-stop: init
$i "Build the release"
$t $(MAKE) -C $(APP) $v
+ $i "Stop the release (in case one is running from a previously aborted run)"
+ $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release$(RELX_REL_EXT) stop || true
+ifeq ($(PLATFORM),msys2)
+ $t $(APP)/_rel/$(APP)_release/bin/$(APP)_release$(RELX_REL_EXT) uninstall || true
+endif
+
$i "Start the release"
ifeq ($(PLATFORM),msys2)
$t $(APP)/tmp/bin/$(APP)_release$(RELX_REL_EXT) install