diff options
| author | Peter Andersson <[email protected]> | 2014-05-02 11:02:07 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2014-05-02 11:02:07 +0200 |
| commit | d019a20989b3f299e8fdcf20dc210e233ddc3028 (patch) | |
| tree | 9c104eebe7f9e6e190acfffea50cd8cfa7838c8b /lib/test_server | |
| parent | 7a76bd5b8794a5a1b2223b7cd6dce6b37bdb2d0b (diff) | |
| parent | 43fe944a466c47cca84cc4b02371004847927355 (diff) | |
| download | otp-d019a20989b3f299e8fdcf20dc210e233ddc3028.tar.gz otp-d019a20989b3f299e8fdcf20dc210e233ddc3028.tar.bz2 otp-d019a20989b3f299e8fdcf20dc210e233ddc3028.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/test_server')
| -rw-r--r-- | lib/test_server/src/test_server.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl index 9b05bddf63..70dc7a1441 100644 --- a/lib/test_server/src/test_server.erl +++ b/lib/test_server/src/test_server.erl @@ -444,7 +444,7 @@ run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) -> %% If this process (group leader of the test case) terminates before %% all messages have been replied back to the io server, the io server %% hangs. Fixed by the 20 milli timeout check here, and by using monitor in -%% io.erl (livrem OCH hangslen mao :) +%% io.erl. %% %% A test case is known to have failed if it returns {'EXIT', _} tuple, %% or sends a message {failed, File, Line} to it's group_leader @@ -673,7 +673,7 @@ handle_tc_exit({testcase_aborted,{user_timetrap_error,_}=Msg,_}, St) -> spawn_fw_call(Mod, Func, Config, Pid, Msg, unknown, self()), St; handle_tc_exit(Reason, #st{status={framework,FwMod,FwFunc}, - config=Config,pid=Pid}=St) -> + config=Config,pid=Pid}=St) -> R = case Reason of {timetrap_timeout,TVal,_} -> {timetrap,TVal}; |