aboutsummaryrefslogtreecommitdiffstats
path: root/makefile
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
commitf1406ebe53dd38003cd1fd3121946ae4924de03c (patch)
tree6b13265c066c8c32f4ed5d44fc9ca8421d118d06 /makefile
parent5399b9b9057f8202ceb25e933d10e1825383bc99 (diff)
parent37fc8f2a2fdaac95d7aee6e51b88514f3febef31 (diff)
downloadprosody-f1406ebe53dd38003cd1fd3121946ae4924de03c.tar.gz
prosody-f1406ebe53dd38003cd1fd3121946ae4924de03c.zip
Merge 0.11->trunk
Diffstat (limited to 'makefile')
-rw-r--r--makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/makefile b/makefile
index d19ec24d..0b1c8788 100644
--- a/makefile
+++ b/makefile
@@ -19,6 +19,9 @@ INSTALL_EXEC=$(INSTALL) -m755
MKDIR=install -d
MKDIR_PRIVATE=$(MKDIR) -m750
+LUACHECK=luacheck
+BUSTED=busted
+
.PHONY: all test clean install
all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
@@ -68,8 +71,13 @@ clean:
rm -f prosody.version
$(MAKE) clean -C util-src
+lint:
+ $(LUACHECK) -q $$(HGPLAIN= hg files -I '**.lua') prosody prosodyctl
+ @echo $$(sed -n '/^\tlocal exclude_files/,/^}/p;' .luacheckrc | sed '1d;$d' | wc -l) files ignored
+ shellcheck configure
+
test:
- busted --lua=$(RUNWITH)
+ $(BUSTED) --lua=$(RUNWITH)
prosody.install: prosody