Merge 0.10->trunk

[prosody.git] / Makefile

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