From 64b7335fd7d557dd269a74be95bbe375a096e335 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 4 Dec 2018 16:19:08 +0000
Subject: makefile: Add lint target (to match GNUMakefile)

---
 makefile | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'makefile')

diff --git a/makefile b/makefile
index d19ec24d..1b8e99b5 100644
--- a/makefile
+++ b/makefile
@@ -19,6 +19,8 @@ INSTALL_EXEC=$(INSTALL) -m755
 MKDIR=install -d
 MKDIR_PRIVATE=$(MKDIR) -m750
 
+LUACHECK=luacheck
+
 .PHONY: all test clean install
 
 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
@@ -68,6 +70,11 @@ 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)
 
-- 
cgit v1.2.3


From bd19b153479f2f54ce4357398091a8513afd8506 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 4 Dec 2018 16:19:58 +0000
Subject: makefile: Allow configuring path to busted (to match GNUMakefile)

---
 makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 1b8e99b5..0b1c8788 100644
--- a/makefile
+++ b/makefile
@@ -20,6 +20,7 @@ MKDIR=install -d
 MKDIR_PRIVATE=$(MKDIR) -m750
 
 LUACHECK=luacheck
+BUSTED=busted
 
 .PHONY: all test clean install
 
@@ -76,7 +77,7 @@ lint:
 	shellcheck configure
 
 test:
-	busted --lua=$(RUNWITH)
+	$(BUSTED) --lua=$(RUNWITH)
 
 
 prosody.install: prosody
-- 
cgit v1.2.3