Merge 0.10->trunk

[prosody.git] / Makefile

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