diff options
| author | Björn Gustavsson <[email protected]> | 2012-11-08 14:49:36 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-11-08 14:49:36 +0100 |
| commit | a1ba0ade00a08968d289912c8a8b709417ba80c5 (patch) | |
| tree | c41db49405fe6b9d905abbe059d4ecf286d0072d /lib/test_server/src/test_server_ctrl.erl | |
| parent | 27cadfdfb196d29cc237a7938fe97671d40264a6 (diff) | |
| parent | f816de97c1fdbb96ca09a8980dab32ad2e1785e7 (diff) | |
| download | otp-a1ba0ade00a08968d289912c8a8b709417ba80c5.tar.gz otp-a1ba0ade00a08968d289912c8a8b709417ba80c5.tar.bz2 otp-a1ba0ade00a08968d289912c8a8b709417ba80c5.zip | |
Merge branch 'bjorn/ct/minor-corrections'
* bjorn/ct/minor-corrections:
test_server_io: Correct a few comments
Handle ct:abort_current_testcase/1 when executing parallel groups
Make sure that "Cover analysing..." is written to stdout
Make sure that "Testing..." is not written if testing has finished
Diffstat (limited to 'lib/test_server/src/test_server_ctrl.erl')
| -rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index e90586b7d4..7b2ebcefc0 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -350,8 +350,7 @@ wait_finish() -> ok. abort_current_testcase(Reason) -> - controller_call({abort_current_testcase,Reason}), - ok. + controller_call({abort_current_testcase,Reason}). abort() -> OldTrap = process_flag(trap_exit, true), @@ -1185,6 +1184,7 @@ init_tester(Mod, Func, Args, Dir, Name, {_,_,MinLev}=Levels, group_leader(test_server_io:get_gl(true), self()), {TimeMy,Result} = ts_tc(Mod, Func, Args), set_io_buffering(undefined), + test_server_io:set_job_name(undefined), catch stop_extra_tools(StartedExtraTools), case Result of {'EXIT',test_suites_done} -> @@ -3434,6 +3434,11 @@ handle_io_and_exit_loop(_, [], Ok,Skip,Fail) -> handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases) -> receive + {abort_current_testcase=Tag,_Reason,From} -> + %% If a parallel group is executing, there is no unique + %% current test case, so we must generate an error. + From ! {self(),Tag,{error,parallel_group}}, + handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases); %% end of io session from test case executed by main process {finished,_,Main,CaseNum,Mod,Func,Result,_RetVal} -> test_server_io:print_buffered(CurrPid), |