Merge 0.9->0.10

[prosody.git] / tests / test.lua

diff --git a/tests/test.lua b/tests/test.lua
index f7475a805d1395e9c379aa7534f9ecff15a41b89..36c2fd6ec919d1aa2ce7aa3d36022dbbce2258c7 100644 (file)
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -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 };
@@ -22,6 +22,7 @@ function run_all_tests()
        dotest "util.sasl.scram"
 
        dosingletest("test_sasl.lua", "latin1toutf8");
+       dosingletest("test_utf8.lua", "valid");
 end
 
 local verbosity = tonumber(arg[1]) or 2;
@@ -98,6 +99,7 @@ function dosingletest(testname, fname)
        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);
@@ -170,6 +172,7 @@ function dotest(unitname)
                        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);
@@ -189,6 +192,7 @@ function runtest(f, msg)
        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
@@ -236,3 +240,5 @@ function new_line_coverage_monitor(file)
 end
 
 run_all_tests()
+
+os.exit(tests_passed and 0 or 1);