aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-18 19:09:37 +0100
committerKim Alvefur <zash@zash.se>2016-02-18 19:09:37 +0100
commit4c7d2c5ba6e64b5041aec931f48279cfeba1155d (patch)
tree1883cbfa152cdb2502babee7e10fbc2cdf72415e
parent90252e8dcc284a3213ae738052c6b6d95628eea7 (diff)
parent7b9355994bff374e6fc2b578df410313fab0e9ce (diff)
downloadprosody-4c7d2c5ba6e64b5041aec931f48279cfeba1155d.tar.gz
prosody-4c7d2c5ba6e64b5041aec931f48279cfeba1155d.zip
Merge 0.10->trunk
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0138e05c..4e4a407d 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ clean:
$(MAKE) clean -C util-src
test:
- cd tests && ./run_tests.sh
+ cd tests && $(RUNWITH) test.lua
util/%.so:
$(MAKE) install -C util-src