diff options
| author | Siri Hansen <[email protected]> | 2014-05-28 12:11:11 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-05-28 12:11:11 +0200 |
| commit | dfbfe7fa8256a3b78d12b8d92b94e955039ca20f (patch) | |
| tree | ee289825dec2520722105f8f79804b2f45a3e559 /lib/observer/test | |
| parent | 0d0d642ba596d4bb92549e01d29b7295bd5a4698 (diff) | |
| parent | 235d02334181df0bed92b8c6af07d092627691fe (diff) | |
| download | otp-dfbfe7fa8256a3b78d12b8d92b94e955039ca20f.tar.gz otp-dfbfe7fa8256a3b78d12b8d92b94e955039ca20f.tar.bz2 otp-dfbfe7fa8256a3b78d12b8d92b94e955039ca20f.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/observer/test')
| -rw-r--r-- | lib/observer/test/crashdump_helper.erl | 4 | ||||
| -rw-r--r-- | lib/observer/test/crashdump_viewer_SUITE.erl | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl index 40dbe28d46..0eb4a92c53 100644 --- a/lib/observer/test/crashdump_helper.erl +++ b/lib/observer/test/crashdump_helper.erl @@ -35,7 +35,9 @@ n1_proc(Creator,_N2,Pid2,Port2,_L) -> register(aaaaaaaa,self()), process_flag(save_calls,3), ets:new(cdv_test_ordset_table,[ordered_set]), - erlang:send_after(1000000,self(),cdv_test_timer_message), + erlang:send_after(1000000,self(),cdv_test_timer_message1), + erlang:send_after(1000000,aaaaaaaa,cdv_test_timer_message2), + erlang:send_after(1000000,noexistproc,cdv_test_timer_message3), Port = hd(erlang:ports()), Fun = fun() -> ok end, Ref = make_ref(), diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl index 4700dc4bab..1266b1f9b9 100644 --- a/lib/observer/test/crashdump_viewer_SUITE.erl +++ b/lib/observer/test/crashdump_viewer_SUITE.erl @@ -385,8 +385,14 @@ special(File,Procs) -> {ok,[_Ets=#ets_table{}],[]} = crashdump_viewer:ets_tables(Pid), io:format(" ets tables ok",[]), - {ok,[_Timer=#timer{}],[]} = crashdump_viewer:timers(Pid), - io:format(" timers ok",[]), + + {ok,[#timer{pid=Pid0,name=undefined}, + #timer{pid=Pid0,name="aaaaaaaa"}],[]} = + crashdump_viewer:timers(Pid), + {ok,AllTimers,_TimersTW} = crashdump_viewer:timers(all), + #timer{name="noexistproc"} = + lists:keyfind(undefined,#timer.pid,AllTimers), + io:format(" timers ok:",[]), {ok,Mod1=#loaded_mod{},[]} = crashdump_viewer:loaded_mod_details(atom_to_list(?helper_mod)), |