# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1455818977 -3600
# Node ID d843b7911d47061135785a890cf1c30e56df4baa
# Parent  af26e8eb591f4a0a42e5842d7fa560b2d631f419# Parent  f0e6757261bcac09ace28f2c36b8a1ce1bd19537
Merge 0.10->trunk

diff -r af26e8eb591f -r d843b7911d47 Makefile
--- 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