aboutsummaryrefslogtreecommitdiffstats
path: root/GNUmakefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-07-08 02:44:32 +0200
committerKim Alvefur <zash@zash.se>2019-07-08 02:44:32 +0200
commitf2b49140d8f9309bb3613effbef0739216ba7a9b (patch)
tree6b13265c066c8c32f4ed5d44fc9ca8421d118d06 /GNUmakefile
parente081fd664251a2eb7ab68262c2b8a3cad4b381c7 (diff)
parentae48864f9d7368bf2030d391d68d6363278202ea (diff)
downloadprosody-f2b49140d8f9309bb3613effbef0739216ba7a9b.tar.gz
prosody-f2b49140d8f9309bb3613effbef0739216ba7a9b.zip
Merge 0.11->trunk
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 6c134679..977e91c6 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -21,6 +21,7 @@ MKDIR_PRIVATE=$(MKDIR) -m750
LUACHECK=luacheck
BUSTED=busted
+SCANSION=scansion
.PHONY: all test coverage clean install
@@ -71,6 +72,12 @@ clean:
test:
$(BUSTED) --lua=$(RUNWITH)
+integration-test: all
+ $(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua start
+ $(SCANSION) -d ./spec/scansion; R=$$? \
+ $(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua stop \
+ exit $$R
+
coverage:
-rm -- luacov.*
$(BUSTED) --lua=$(RUNWITH) -c