Merge 0.10->trunk

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index 130d8aa7a31e7d9c423f165d0ed84ff7881bd252..06e67c9ce119df61296797db8ebdf2357eeec1a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,10 @@ clean:
        rm -f prosody.version
        $(MAKE) clean -C util-src
 
+test:
+       cd tests && $(RUNWITH) test.lua 0
+       # Skipping: cd tests && RUNWITH=$(RUNWITH) ./test_util_json.sh
+
 util/%.so:
        $(MAKE) install -C util-src