aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-01-24 05:48:55 +0100
committerKim Alvefur <zash@zash.se>2019-01-24 05:48:55 +0100
commitdf36d51cd7e63834fce8d0d38f3547d873195c95 (patch)
tree57621048f13a7cbe0636dd6915fbedaebd3d086d
parent2748b1f5ec7b48eae6bc8ebeb4db84f8e62cd963 (diff)
downloadprosody-df36d51cd7e63834fce8d0d38f3547d873195c95.tar.gz
prosody-df36d51cd7e63834fce8d0d38f3547d873195c95.zip
GNUmakefile: Stop Prosody in case of failure in integration-test
Normally make skips the remaning steps in the rule if one fails. This collects the status code and re-returns it after stopping the running Prosody instance.
-rw-r--r--GNUmakefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile
index dd199997..977e91c6 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -74,8 +74,9 @@ test:
integration-test: all
$(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua start
- $(SCANSION) -d ./spec/scansion
- $(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua stop
+ $(SCANSION) -d ./spec/scansion; R=$$? \
+ $(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua stop \
+ exit $$R
coverage:
-rm -- luacov.*