From be0c9a73c891a8d12a249abf558770f540f316e9 Mon Sep 17 00:00:00 2001 From: Peter Andersson Date: Mon, 14 Nov 2011 17:02:22 +0100 Subject: Copy default CSS file to log directory before test run The log files should be independent of the Common Test installation. --- lib/test_server/src/test_server.erl | 1 + lib/test_server/src/test_server_ctrl.erl | 47 ++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 21 deletions(-) (limited to 'lib/test_server/src') diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl index 0026b95872..2287d0fd5b 100644 --- a/lib/test_server/src/test_server.erl +++ b/lib/test_server/src/test_server.erl @@ -611,6 +611,7 @@ do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) -> print(minor, "Test case started with:\n~s:~s(~p)\n", [Mod,Func,Args2Print]), print(minor, "Current directory is ~p\n", [Cwd]), print_timestamp(minor,"Started at "), + print(minor, "\n", []), TCCallback = get(test_server_testcase_callback), LogOpts = get(test_server_logopts), Ref = make_ref(), diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index 49cce9c429..14a77f5785 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -1692,23 +1692,24 @@ do_test_cases(TopCases, SkipCases, [print_if_known(N, {", ~w test cases",[N]}, {" (with repeated test cases)",[]})]), Test = get(test_server_name), - TestName = if is_list(Test) -> - lists:flatten(io_lib:format("~s", [Test])); - true -> - lists:flatten(io_lib:format("~p", [Test])) - end, + TestName = if is_list(Test) -> + lists:flatten(io_lib:format("~s", [Test])); + true -> + lists:flatten(io_lib:format("~p", [Test])) + end, + TestDescr = "Test " ++ TestName ++ " results", test_server_sup:framework_call(report, [tests_start,{Test,N}]), {Header,Footer} = case test_server_sup:framework_call(get_html_wrapper, - [Test,true], "") of + [TestDescr,true], "") of Empty when (Empty == "") ; (element(2,Empty) == "") -> put(basic_html, true), {["\n", "\n", "\n", - "Test ", TestName, " results\n", + "", TestDescr, "\n", "\n", "\n", "", "")), - print(html, xhtml("

HOST:
\n", "

HOST:
\n")), + print(html, xhtml("\n

Host info:
\n", + "\n

Host info:
\n")), print_who(test_server_sup:hoststr(), test_server_sup:get_username()), print(html, xhtml("
Used Erlang v~s in ~s

\n", "
Used Erlang v~s in \"~s\"

\n"), [erlang:system_info(version), code:root_dir()]), if FwMod == ?MODULE -> - print(html, xhtml("

TARGET:
\n", "

TARGET:
\n")), + print(html, xhtml("\n

Target Info:
\n", + "\n

Target Info:
\n")), print_who(TI#target_info.host, TI#target_info.username), print(html, xhtml("
Used Erlang v~s in ~s

\n", "
Used Erlang v~s in \"~s\"

\n"), @@ -1747,7 +1750,8 @@ do_test_cases(TopCases, SkipCases, case test_server_sup:framework_call(target_info, []) of TargetInfo when is_list(TargetInfo), length(TargetInfo) > 0 -> - print(html, xhtml("

TARGET:
\n", "

TARGET:
\n")), + print(html, xhtml("\n

Target info:
\n", + "\n

Target info:
\n")), print(html, "~s

\n", [TargetInfo]); _ -> ok @@ -1755,9 +1759,9 @@ do_test_cases(TopCases, SkipCases, end, print(html, - "

\n", [?suitelog_name,?coverlog_name]), print(html, "

~s

\n" ++ @@ -1908,16 +1912,16 @@ start_minor_log_file1(Mod, Func, LogDir, AbsName) -> Lev = get(test_server_minor_level)+1000, %% far down in the minor levels put(test_server_minor_fd, Fd), - TestName = io_lib:format("~p:~p", [Mod,Func]), + TestDescr = io_lib:format("Test ~p:~p result", [Mod,Func]), {Header,Footer} = case test_server_sup:framework_call(get_html_wrapper, - [TestName,false], "") of + [TestDescr,false], "") of Empty when (Empty == "") ; (element(2,Empty) == "") -> put(basic_html, true), {["\n", "\n", "\n", - "Test ", TestName, "\n", + "", TestDescr, "\n", "\n", "\n", " ok; % dest file up to date _ -> Header = - case test_server_sup:framework_call(get_html_header, - [Src,false], "") of + case test_server_sup:framework_call(get_html_wrapper, + ["Module "++Src,false], + "") of Empty when (Empty == "") ; (element(2,Empty) == "") -> ["\n", - "\n", + "\n", "\n", - "Test ", Src, "\n", + "Module ", Src, "\n", "\n", "\n", @@ -3618,7 +3623,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where, test_server_sup:framework_call(report, [tc_start,{?pl2a(Mod),Func}]), print(major, "=case ~p:~p", [Mod, Func]), MinorName = start_minor_log_file(Mod, Func), - print(minor, "", []), + print(minor, "", []), MinorBase = filename:basename(MinorName), print(major, "=logfile ~s", [filename:basename(MinorName)]), print_props((RunInit==skip_init), get_props(Mode)), @@ -3642,7 +3647,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where, {died,DReason,DLoc,DCmt} -> {died,DReason,DLoc,[],DCmt} end, - print(minor, "", []), + print(minor, "", []), print_timestamp(minor, "Ended at "), print(major, "=ended ~s", [lists:flatten(timestamp_get(""))]), -- cgit v1.2.3