diff options
| author | Siri Hansen <[email protected]> | 2014-11-11 14:41:18 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-11-11 14:41:18 +0100 |
| commit | fdc3edacb5577688dd3d92bba6194321c06537b3 (patch) | |
| tree | 28f48d1e7d6294e8a59fdfc8ab9f38e5a0d29b43 /lib/stdlib/test | |
| parent | b3741f2b8e2ed9f370abb029160d1817497436e1 (diff) | |
| parent | 8276831a98ebe3d3b821ffcc1093acbebf0c6022 (diff) | |
| download | otp-fdc3edacb5577688dd3d92bba6194321c06537b3.tar.gz otp-fdc3edacb5577688dd3d92bba6194321c06537b3.tar.bz2 otp-fdc3edacb5577688dd3d92bba6194321c06537b3.zip | |
Merge branch 'siri/gen_server/try-catch/OTP-12263' into maint
* siri/gen_server/try-catch/OTP-12263:
Add stack trace for gen_server exit in ERROR REPORT
Diffstat (limited to 'lib/stdlib/test')
| -rw-r--r-- | lib/stdlib/test/gen_server_SUITE.erl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl index 42694d8b5d..0f03fda30a 100644 --- a/lib/stdlib/test/gen_server_SUITE.erl +++ b/lib/stdlib/test/gen_server_SUITE.erl @@ -275,7 +275,9 @@ crash(Config) when is_list(Config) -> receive {error,_GroupLeader4,{Pid4, "** Generic server"++_, - [Pid4,crash,{formatted, state4},crashed]}} -> + [Pid4,crash,{formatted, state4}, + {crashed,[{?MODULE,handle_call,3,_} + |_Stacktrace]}]}} -> ok; Other4a -> ?line io:format("Unexpected: ~p", [Other4a]), @@ -1026,7 +1028,9 @@ error_format_status(Config) when is_list(Config) -> receive {error,_GroupLeader,{Pid, "** Generic server"++_, - [Pid,crash,{formatted, State},crashed]}} -> + [Pid,crash,{formatted, State}, + {crashed,[{?MODULE,handle_call,3,_} + |_Stacktrace]}]}} -> ok; Other -> ?line io:format("Unexpected: ~p", [Other]), @@ -1048,7 +1052,9 @@ terminate_crash_format(Config) when is_list(Config) -> receive {error,_GroupLeader,{Pid, "** Generic server"++_, - [Pid,stop, {formatted, State},{crash, terminate}]}} -> + [Pid,stop, {formatted, State}, + {{crash, terminate},[{?MODULE,terminate,2,_} + |_Stacktrace]}]}} -> ok; Other -> io:format("Unexpected: ~p", [Other]), |