diff options
| author | Sverker Eriksson <[email protected]> | 2017-10-10 12:24:01 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-10-10 12:24:01 +0200 |
| commit | 7d3a88f370b140664f34b4d3b73d38d30952a830 (patch) | |
| tree | a35f01918be81ce994fc3626fb0ac9931c425e5d /lib | |
| parent | 23ed87829571316b4d026dd57bb69737921f7fcc (diff) | |
| parent | c0bbf64eeffcfd1aa662ddec4744186862d9ca69 (diff) | |
| download | otp-7d3a88f370b140664f34b4d3b73d38d30952a830.tar.gz otp-7d3a88f370b140664f34b4d3b73d38d30952a830.tar.bz2 otp-7d3a88f370b140664f34b4d3b73d38d30952a830.zip | |
Merge branch 'sverker/fix-code_SUITE-upgrade' into maint
Diffstat (limited to 'lib')
| -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 |