Merge 0.10->trunk

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index 4e4a407daf5fc03e056162d08e0b2bf0a3d5d974..06e67c9ce119df61296797db8ebdf2357eeec1a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,8 @@ clean:
        $(MAKE) clean -C util-src
 
 test:
-       cd tests && $(RUNWITH) test.lua
+       cd tests && $(RUNWITH) test.lua 0
+       # Skipping: cd tests && RUNWITH=$(RUNWITH) ./test_util_json.sh
 
 util/%.so:
        $(MAKE) install -C util-src