aboutsummaryrefslogtreecommitdiffstats
path: root/GNUmakefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-11-16 16:52:31 +0100
committerKim Alvefur <zash@zash.se>2019-11-16 16:52:31 +0100
commit612b1ffff129320130095099acc13b335aa14b9c (patch)
tree6e391ff6608608f181e42c92ee6dfd7c534da255 /GNUmakefile
parent6a2b94e8b8629d6571202a34b6ebbd4793fe4abe (diff)
parent70a81b5ffdb84e5dc082fee557dc9e3af237bc27 (diff)
downloadprosody-612b1ffff129320130095099acc13b335aa14b9c.tar.gz
prosody-612b1ffff129320130095099acc13b335aa14b9c.zip
Merge 0.11->trunk
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 6c134679..15362f5c 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,13 @@ clean:
test:
$(BUSTED) --lua=$(RUNWITH)
+integration-test: all
+ $(MKDIR) data
+ $(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