diff options
| author | Peter Andersson <[email protected]> | 2014-05-02 11:00:26 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2014-05-02 11:00:26 +0200 |
| commit | 43fe944a466c47cca84cc4b02371004847927355 (patch) | |
| tree | 148a5071a0d882d14261710a8c806d324bc334b8 /lib/test_server/src/test_server.erl | |
| parent | 10f47281bf94e7e3ed98f97f3c1531036edce9cc (diff) | |
| parent | af8a352109ba87f7960ab46bd6ed1d237b87ed7c (diff) | |
| download | otp-43fe944a466c47cca84cc4b02371004847927355.tar.gz otp-43fe944a466c47cca84cc4b02371004847927355.tar.bz2 otp-43fe944a466c47cca84cc4b02371004847927355.zip | |
Merge remote branch 'origin/peppe/common_test/ct_comment_problem' into maint
* origin/peppe/common_test/ct_comment_problem:
Fix problem with comments getting lost when running parallel test cases
Diffstat (limited to 'lib/test_server/src/test_server.erl')
| -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}; |