diff options
| author | Lars Thorsen <[email protected]> | 2019-01-08 12:23:28 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2019-01-08 12:23:28 +0100 |
| commit | 0d218ea065dcb087a2ca0fafa1f447c4c73cea84 (patch) | |
| tree | 03694bdd310b66a72bcfc041df7186cd06252982 /lib/observer | |
| parent | e2fdbdf1502ec46cf25a2cb399febd23b480469f (diff) | |
| parent | 91e5207a14ff50bfc42aa9bcf2219cc2f4af63f8 (diff) | |
| download | otp-0d218ea065dcb087a2ca0fafa1f447c4c73cea84.tar.gz otp-0d218ea065dcb087a2ca0fafa1f447c4c73cea84.tar.bz2 otp-0d218ea065dcb087a2ca0fafa1f447c4c73cea84.zip | |
Merge branch 'maint'
* maint:
[xmerl] Fix detect charset crash
[cdv] Check only own persistent terms in crashdump_viewer test
Fix remote-call error in ms_transform
Conflicts:
lib/observer/test/crashdump_helper.erl
Diffstat (limited to 'lib/observer')
| -rw-r--r-- | lib/observer/test/crashdump_helper.erl | 2 | ||||
| -rw-r--r-- | lib/observer/test/crashdump_viewer_SUITE.erl | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl index a71e8fc29c..d6b5eff9b5 100644 --- a/lib/observer/test/crashdump_helper.erl +++ b/lib/observer/test/crashdump_helper.erl @@ -204,4 +204,4 @@ dump_persistent_terms() -> create_persistent_terms() -> persistent_term:put({?MODULE,first}, {pid,42.0}), persistent_term:put({?MODULE,second}, [1,2,3]), - persistent_term:get(). + {persistent_term:get({?MODULE,first}),persistent_term:get({?MODULE,second})}. diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl index 8c5e618f4a..31cf7011d4 100644 --- a/lib/observer/test/crashdump_viewer_SUITE.erl +++ b/lib/observer/test/crashdump_viewer_SUITE.erl @@ -615,9 +615,8 @@ special(File,Procs) -> #proc{dict=Dict} = ProcDetails, %% io:format("~p\n", [Dict]), - Pts1 = crashdump_helper:create_persistent_terms(), - Pts2 = proplists:get_value(pts,Dict), - true = lists:sort(Pts1) =:= lists:sort(Pts2), + Pts = crashdump_helper:create_persistent_terms(), + Pts = proplists:get_value(pts,Dict), io:format(" persistent terms ok",[]), ok; _ -> |