Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 18 Feb 2016 19:09:37 +0100
changeset 7169 d843b7911d47
parent 7167 af26e8eb591f (current diff)
parent 7168 f0e6757261bc (diff)
child 7171 d11154910be4
Merge 0.10->trunk
--- a/Makefile	Thu Feb 18 15:00:17 2016 +0100
+++ b/Makefile	Thu Feb 18 19:09:37 2016 +0100
@@ -53,7 +53,7 @@
 	$(MAKE) clean -C util-src
 
 test:
-	cd tests && ./run_tests.sh
+	cd tests && $(RUNWITH) test.lua
 
 util/%.so:
 	$(MAKE) install -C util-src
prosody