# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1441361500 -3600
# Node ID 17a4e89a47805316726c0a1110351656b53f593c
# Parent  621384d89a44528af13233ea8e8cc2486c998a29# Parent  766aa454c79f321ace5f91dae45e5770921c6d2f
Merge 0.10->trunk

diff -r 621384d89a44 -r 17a4e89a4780 net/http.lua
diff -r 621384d89a44 -r 17a4e89a4780 tests/run_tests.sh
--- a/tests/run_tests.sh	Thu Sep 03 23:49:15 2015 +0200
+++ b/tests/run_tests.sh	Fri Sep 04 11:11:40 2015 +0100
@@ -1,3 +1,3 @@
 #!/bin/sh
 rm reports/*.report
-lua test.lua $*
+exec lua test.lua $*
diff -r 621384d89a44 -r 17a4e89a4780 tests/test.lua
--- a/tests/test.lua	Thu Sep 03 23:49:15 2015 +0200
+++ b/tests/test.lua	Fri Sep 04 11:11:40 2015 +0100
@@ -6,7 +6,7 @@
 -- COPYING file in the source package for more information.
 --
 
-
+local tests_passed = true;
 
 function run_all_tests()
 	package.loaded["net.connlisteners"] = { get = function () return {} end };
@@ -99,6 +99,7 @@
 	local success, ret = pcall(tests[fname]);
 	debug.sethook();
 	if not success then
+		tests_passed = false;
 		print("TEST FAILED! Unit: ["..testname.."] Function: ["..fname.."]");
 		print("   Location: "..ret:gsub(":%s*\n", "\n"));
 		line_info(fname, false, report_file);
@@ -171,6 +172,7 @@
 			local success, ret = pcall(test, f, unit);
 			debug.sethook();
 			if not success then
+				tests_passed = false;
 				print("TEST FAILED! Unit: ["..unitname.."] Function: ["..name.."]");
 				print("   Location: "..ret:gsub(":%s*\n", "\n"));
 				line_info(name, false, report_file);
@@ -190,6 +192,7 @@
 	if success and verbosity >= 2 then
 		print("SUBTEST PASSED: "..(msg or "(no description)"));
 	elseif (not success) and verbosity >= 0 then
+		tests_passed = false;
 		print("SUBTEST FAILED: "..(msg or "(no description)"));
 		error(ret, 0);
 	end
@@ -237,3 +240,5 @@
 end
 
 run_all_tests()
+
+os.exit(tests_passed and 0 or 1);