From 45b1245e12ee56a85bb8fb942f98673902fd706f Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 10 Jan 2019 14:27:01 +0100 Subject: GNUmakefile: Add target for running scansion --- GNUmakefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 6c134679..dd199997 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,11 @@ clean: test: $(BUSTED) --lua=$(RUNWITH) +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 + coverage: -rm -- luacov.* $(BUSTED) --lua=$(RUNWITH) -c -- cgit v1.2.3 From df36d51cd7e63834fce8d0d38f3547d873195c95 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 24 Jan 2019 05:48:55 +0100 Subject: 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. --- GNUmakefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'GNUmakefile') 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.* -- cgit v1.2.3 From b733d61de629dabbc1678781711b3775b7ce17cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Thu, 12 Sep 2019 15:17:12 +0200 Subject: Prepare required data folder for integration tests --- GNUmakefile | 1 + 1 file changed, 1 insertion(+) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 977e91c6..15362f5c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -73,6 +73,7 @@ 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 \ -- cgit v1.2.3 From 6b98a3f55143f5be0b22ff5ce83999363cd5e253 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 2 Jun 2020 19:43:50 +0200 Subject: mod_s2s: Move out of empty directory mod_s2s.lua had been all alone in there since the removal of s2sout.lib.lua in 756b8821007a --- GNUmakefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 15362f5c..950690e6 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -49,9 +49,8 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin $(INSTALL_DATA) util/*.so $(SOURCE)/util $(MKDIR) $(SOURCE)/util/sasl $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl - $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam + $(MKDIR) $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam $(INSTALL_DATA) plugins/*.lua $(MODULES) - $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc -- cgit v1.2.3 From 5fc5fe64ee3bf260981a652f2abece5004899548 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 3 Jun 2020 19:01:46 +0200 Subject: GNUmakefile: Install util.human.* --- GNUmakefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 950690e6..00c73c54 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -49,6 +49,8 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin $(INSTALL_DATA) util/*.so $(SOURCE)/util $(MKDIR) $(SOURCE)/util/sasl $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl + $(MKDIR) $(SOURCE)/util/human + $(INSTALL_DATA) util/human/*.lua $(SOURCE)/util/human $(MKDIR) $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam $(INSTALL_DATA) plugins/*.lua $(MODULES) $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub -- cgit v1.2.3 From 1deae0e925edc5b83e1ca509be2d72bc1d686130 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 3 Jun 2020 19:10:42 +0200 Subject: GNUmakefile: Install the new util/prosodyctl/* too (thanks pascal.pascher) --- GNUmakefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 00c73c54..460f61ca 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -51,6 +51,8 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl $(MKDIR) $(SOURCE)/util/human $(INSTALL_DATA) util/human/*.lua $(SOURCE)/util/human + $(MKDIR) $(SOURCE)/util/prosodyctl + $(INSTALL_DATA) util/prosodyctl/*.lua $(SOURCE)/util/prosodyctl $(MKDIR) $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam $(INSTALL_DATA) plugins/*.lua $(MODULES) $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub -- cgit v1.2.3 From 5fd3895de56b1189e2baac2a17a02a301785e625 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 2 Oct 2020 16:35:05 +0200 Subject: make: Add way to run individual tests --- GNUmakefile | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 460f61ca..1846d72d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -75,6 +75,9 @@ clean: test: $(BUSTED) --lua=$(RUNWITH) +test-%: + $(BUSTED) --lua=$(RUNWITH) -r $* + integration-test: all $(MKDIR) data $(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua start @@ -82,6 +85,13 @@ integration-test: all $(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua stop \ exit $$R +integration-test-%: all + $(MKDIR) data + $(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua start + $(SCANSION) ./spec/scansion/$*.scs; R=$$? \ + $(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua stop \ + exit $$R + coverage: -rm -- luacov.* $(BUSTED) --lua=$(RUNWITH) -c -- cgit v1.2.3