diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-09-04 11:11:40 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-09-04 11:11:40 +0100 |
| commit | 4591053d46bc7fa2dc589236856917ed37f9bb88 (patch) | |
| tree | d409a1964df76fe222241923402f863655ea7437 /tests/test.lua | |
| parent | 4db1bdfc87c6f56610c0e0f4732cca7ff1302efa (diff) | |
| parent | 9fd5e93f0c2e8c0526d718d17e2b96775436e0dd (diff) | |
| download | prosody-4591053d46bc7fa2dc589236856917ed37f9bb88.tar.gz prosody-4591053d46bc7fa2dc589236856917ed37f9bb88.zip | |
Merge 0.10->trunk
Diffstat (limited to 'tests/test.lua')
| -rw-r--r-- | tests/test.lua | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/test.lua b/tests/test.lua index 78f2b234..36c2fd6e 100644 --- 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 }; @@ -99,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); @@ -171,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); @@ -190,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 @@ -237,3 +240,5 @@ function new_line_coverage_monitor(file) end run_all_tests() + +os.exit(tests_passed and 0 or 1); |