diff options
| author | Peter Andersson <[email protected]> | 2011-12-07 16:03:41 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2011-12-07 16:04:25 +0100 |
| commit | aa5a1a246140855fd498ba9098e4a10272b6b391 (patch) | |
| tree | 688d2a26e0eb41b94e2c818313a39661ff9c9c56 | |
| parent | ffcee281f6d804bc4370ed2ab6671dc234cb5e92 (diff) | |
| parent | 68bf49c58de5d44e91f227d406a21b0669bae64d (diff) | |
| download | otp-aa5a1a246140855fd498ba9098e4a10272b6b391.tar.gz otp-aa5a1a246140855fd498ba9098e4a10272b6b391.tar.bz2 otp-aa5a1a246140855fd498ba9098e4a10272b6b391.zip | |
Merge remote branch 'origin/peppe/common_test/report_logfile'
* origin/peppe/common_test/report_logfile:
Get test case log file name reported to user
OTP-9676
| -rw-r--r-- | lib/common_test/src/ct_framework.erl | 4 | ||||
| -rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl index 0897675591..ee0162c5e3 100644 --- a/lib/common_test/src/ct_framework.erl +++ b/lib/common_test/src/ct_framework.erl @@ -1274,6 +1274,10 @@ report(What,Data) -> tests_done -> ok; tc_start -> + %% Data = {{Suite,Func},LogFileName} + ct_event:sync_notify(#event{name=tc_logfile, + node=node(), + data=Data}), ok; tc_done -> {_Suite,Case,Result} = Data, diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index 642bb14c88..70422adccd 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -3625,12 +3625,15 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where, host -> ok end, - 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, "<a name=\"top\"></a>", [], internal_raw), MinorBase = filename:basename(MinorName), print(major, "=logfile ~s", [filename:basename(MinorName)]), + + Args1 = [[{tc_logfile,MinorName} | proplists:delete(tc_logfile,hd(Args))]], + test_server_sup:framework_call(report, [tc_start,{{?pl2a(Mod),Func},MinorName}]), + print_props((RunInit==skip_init), get_props(Mode)), print(major, "=started ~s", [lists:flatten(timestamp_get(""))]), {{Col0,Col1},Style} = get_font_style((RunInit==run_init), Mode), @@ -3644,7 +3647,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where, do_if_parallel(Main, ok, fun erlang:yield/0), %% run the test case {Result,DetectedFail,ProcsBefore,ProcsAfter} = - run_test_case_apply(Num, Mod, Func, Args, get_name(Mode), + run_test_case_apply(Num, Mod, Func, Args1, get_name(Mode), RunInit, Where, TimetrapData), {Time,RetVal,Loc,Opts,Comment} = case Result of |