aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/test_server_ctrl.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-04-24 14:58:06 +0200
committerPeter Andersson <[email protected]>2013-04-24 14:58:06 +0200
commit9b4b5fd1f57819c6a3c04c563b88c0b04caba5fa (patch)
tree43e60893b6a98e159745e6405e91bac9927ffed4 /lib/test_server/src/test_server_ctrl.erl
parentc3e3b87163abebd37f1b1ef40742634ea43dfba3 (diff)
parent5e0617242fe313a6eb3ce57b71eb4a3855de2c66 (diff)
downloadotp-9b4b5fd1f57819c6a3c04c563b88c0b04caba5fa.tar.gz
otp-9b4b5fd1f57819c6a3c04c563b88c0b04caba5fa.tar.bz2
otp-9b4b5fd1f57819c6a3c04c563b88c0b04caba5fa.zip
Merge branch 'peppe/common_test/ts_logfile_problems' into maint
* peppe/common_test/ts_logfile_problems: Fix error with refreshing logs when html util files are missing Add correct footer to last run index page Make test_server close log files properly and include correct footer
Diffstat (limited to 'lib/test_server/src/test_server_ctrl.erl')
-rw-r--r--lib/test_server/src/test_server_ctrl.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 21c10adccb..ffa21d054c 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -1183,7 +1183,7 @@ init_tester(Mod, Func, Args, Dir, Name, {_,_,MinLev}=Levels,
"<td>~.3fs</td><td><b>~ts</b></td><td>~w Ok, ~w Failed~ts of ~w</td></tr>\n"
"</tfoot>\n",
[Time,SuccessStr,OkN,FailedN,SkipStr,OkN+FailedN+SkippedN]),
- test_server_io:stop().
+ test_server_io:stop([major,html,unexpected_io]).
report_severe_error(Reason) ->
test_server_sup:framework_call(report, [severe_error,Reason]).
@@ -1588,7 +1588,7 @@ do_test_cases(TopCases, SkipCases,
print(major, "=started ~s",
[lists:flatten(timestamp_get(""))]),
- put(test_server_html_footer, Footer),
+ test_server_io:set_footer(Footer),
run_test_cases(TestSpec, Config, TimetrapData)
end;