diff options
| author | Kim Alvefur <zash@zash.se> | 2019-06-10 13:22:22 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-06-10 13:22:22 +0200 |
| commit | 0269157c4511472cf0bf377d84f6e99876f83d12 (patch) | |
| tree | 8cd84a76fb673cbfefa00ba1516bd16150f1c780 /GNUmakefile | |
| parent | a4764762b3dad679f40dadd6eb2eb31ea1d5cace (diff) | |
| parent | 9a5a3fd0f10693e6cba2779095398614eb94e68c (diff) | |
| download | prosody-0269157c4511472cf0bf377d84f6e99876f83d12.tar.gz prosody-0269157c4511472cf0bf377d84f6e99876f83d12.zip | |
Merge 0.11->trunk
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 7 |
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 |