diff options
| author | Lukas Larsson <[email protected]> | 2016-04-21 16:07:48 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-04-26 16:02:45 +0200 |
| commit | cf2df1b555072a1413f97259abec38b82513dbdc (patch) | |
| tree | fdf9fcb909e5ad567c76a90cfb559c48c7725ef0 /lib/kernel | |
| parent | 5c154925e9fb0ecd3555ad91b7c9f11aeb173143 (diff) | |
| download | otp-cf2df1b555072a1413f97259abec38b82513dbdc.tar.gz otp-cf2df1b555072a1413f97259abec38b82513dbdc.tar.bz2 otp-cf2df1b555072a1413f97259abec38b82513dbdc.zip | |
kernel: Remove seq_trace event order dep in tc
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/test/seq_trace_SUITE.erl | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/kernel/test/seq_trace_SUITE.erl b/lib/kernel/test/seq_trace_SUITE.erl index 000994751f..be23a1933f 100644 --- a/lib/kernel/test/seq_trace_SUITE.erl +++ b/lib/kernel/test/seq_trace_SUITE.erl @@ -498,7 +498,13 @@ match_set_seq_token(Config) when is_list(Config) -> exit(P2, timeout), {error, "Test node hung"} end, - ok = check_match_set_seq_token_log(Lbl, Log), + + %% Sort the log on Pid, as events from different processes + %% are not guaranteed to arrive in a certain order to the + %% tracer + SortedLog = lists:keysort(2, Log), + + ok = check_match_set_seq_token_log(Lbl, SortedLog), %% stop_node(Sandbox), ok. @@ -551,13 +557,13 @@ do_match_set_seq_token(Label) -> check_match_set_seq_token_log( Label, - [{trace,C,call,{?MODULE,countdown,[B,Ref]}, {0,Label,0,C,0}}, + [{trace,B,call,{?MODULE,bounce, [Ref]}, {0,Label,2,B,1}}, + {trace,B,call,{?MODULE,bounce, [Ref]}, {0,Label,4,B,3}}, + {trace,B,call,{?MODULE,bounce, [Ref]}, {0,Label,6,B,5}}, + {trace,C,call,{?MODULE,countdown,[B,Ref]}, {0,Label,0,C,0}}, {trace,C,call,{?MODULE,countdown,[B,Ref,3]},{0,Label,0,C,0}}, - {trace,B,call,{?MODULE,bounce, [Ref]}, {0,Label,2,B,1}}, {trace,C,call,{?MODULE,countdown,[B,Ref,2]},{0,Label,2,B,1}}, - {trace,B,call,{?MODULE,bounce, [Ref]}, {0,Label,4,B,3}}, {trace,C,call,{?MODULE,countdown,[B,Ref,1]},{0,Label,4,B,3}}, - {trace,B,call,{?MODULE,bounce, [Ref]}, {0,Label,6,B,5}}, {trace,C,call,{?MODULE,countdown,[B,Ref,0]},{0,Label,6,B,5}} ]) -> ok; |