diff options
| author | Sverker Eriksson <[email protected]> | 2017-10-10 12:24:20 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-10-10 12:24:20 +0200 |
| commit | ed2700c3f517e4575ff15558d5d109ee2904083a (patch) | |
| tree | 31f21d1aaddd01671e136c4e585d664bc9f7fb2e | |
| parent | c07404052aa4ede2d8a5714d498637b304e11a6a (diff) | |
| parent | 7d3a88f370b140664f34b4d3b73d38d30952a830 (diff) | |
| download | otp-ed2700c3f517e4575ff15558d5d109ee2904083a.tar.gz otp-ed2700c3f517e4575ff15558d5d109ee2904083a.tar.bz2 otp-ed2700c3f517e4575ff15558d5d109ee2904083a.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/kernel/test/code_SUITE.erl | 11 | ||||
| -rw-r--r-- | lib/kernel/test/code_SUITE_data/upgrade_client.erl | 1 |
2 files changed, 2 insertions, 10 deletions
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl index 612f77149d..569753155f 100644 --- a/lib/kernel/test/code_SUITE.erl +++ b/lib/kernel/test/code_SUITE.erl @@ -1562,16 +1562,7 @@ on_load_trace_on_load(Config) -> erlang:trace_pattern(on_load, false, []), erlang:trace(self(), false, [call]), - %% WE GET TRACES FOR CALLS TO UNDEFINED FUNCTIONS ??? - %% Remove filter when that is fixed. - Ms = lists:filter(fun({trace,Papa,call, - {error_handler,undefined_function, - [on_load_update_code,_,_]}}) - -> false; - (_) -> true - end, - flush()), - + Ms = flush(), [{trace, Papa, call, {on_load_update_code, a, []}}, {trace, Papa, call, {on_load_update_code, b, [99]}}, {trace, Papa, call, {on_load_update_code, c, []}}] = Ms, diff --git a/lib/kernel/test/code_SUITE_data/upgrade_client.erl b/lib/kernel/test/code_SUITE_data/upgrade_client.erl index faa18e1410..1c3c2def53 100644 --- a/lib/kernel/test/code_SUITE_data/upgrade_client.erl +++ b/lib/kernel/test/code_SUITE_data/upgrade_client.erl @@ -341,6 +341,7 @@ check_tracing_loop(N, MsgList) -> stop_tracing(Tracer) -> + erlang:trace_pattern({error_handler,undefined_function,3}, false, [global]), erlang:trace(self(), false, [call]), Tracer ! die_please, receive |