Merge 0.10->trunk

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index e2eca7f1dc13fcfa01fcf5c0a4344801272cdccc..06e67c9ce119df61296797db8ebdf2357eeec1a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
        install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
        install -m755 ./prosody.install $(BIN)/prosody
        install -m755 ./prosodyctl.install $(BIN)/prosodyctl
-       install -m644 core/* $(SOURCE)/core
+       install -m644 core/*.lua $(SOURCE)/core
        install -m644 net/*.lua $(SOURCE)/net
        install -d $(SOURCE)/net/http $(SOURCE)/net/websocket
        install -m644 net/http/*.lua $(SOURCE)/net/http
@@ -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