diff options
author | Siri Hansen <[email protected]> | 2014-05-12 14:54:55 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2014-05-12 14:54:55 +0200 |
commit | e3507ba17f6cb0873d23899e686443b7b8b0f2c7 (patch) | |
tree | 03106ce3243918ed0ed2de57d20ba1e1a68ef9d7 /lib/observer/test | |
parent | 80a528ae9ca670cad91eccf97b385baf67b09981 (diff) | |
parent | c45b158cec83f689b90ea04194e8fe5be08c811e (diff) | |
download | otp-e3507ba17f6cb0873d23899e686443b7b8b0f2c7.tar.gz otp-e3507ba17f6cb0873d23899e686443b7b8b0f2c7.tar.bz2 otp-e3507ba17f6cb0873d23899e686443b7b8b0f2c7.zip |
Merge branch 'siri/master-cuddle-with-tests'
* siri/master-cuddle-with-tests:
Update sasl/test/test_lib.hrl with recent versions of kernel and stdlib
Update crashdump_viewer_SUITE with new release numbers
Diffstat (limited to 'lib/observer/test')
-rw-r--r-- | lib/observer/test/crashdump_viewer_SUITE.erl | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl index e9567c82cb..4700dc4bab 100644 --- a/lib/observer/test/crashdump_viewer_SUITE.erl +++ b/lib/observer/test/crashdump_viewer_SUITE.erl @@ -101,7 +101,7 @@ end_per_group(_GroupName, Config) -> init_per_suite(Config) when is_list(Config) -> delete_saved(Config), DataDir = ?config(data_dir,Config), - Rels = [R || R <- [r15b,r16b], ?t:is_release_available(R)] ++ [current], + Rels = [R || R <- [r16b,'17'], ?t:is_release_available(R)] ++ [current], io:format("Creating crash dumps for the following releases: ~p", [Rels]), AllDumps = create_dumps(DataDir,Rels), [{dumps,AllDumps}|Config]. @@ -557,12 +557,6 @@ dump_with_strange_module_name(DataDir,Rel,DumpName) -> CD. dump(Node,DataDir,Rel,DumpName) -> - case Rel of - _ when Rel<r15b, Rel=/=current -> - rpc:call(Node,os,putenv,["ERL_CRASH_DUMP_SECONDS","600"]); - _ -> - ok - end, rpc:call(Node,erlang,halt,[DumpName]), Crashdump0 = filename:join(filename:dirname(code:which(?t)), "erl_crash_dump.n1"), @@ -617,42 +611,21 @@ dos_dump(DataDir,Rel,Dump) -> rel_opt(Rel) -> case Rel of - r9b -> [{erl,[{release,"r9b_patched"}]}]; - r9c -> [{erl,[{release,"r9c_patched"}]}]; - r10b -> [{erl,[{release,"r10b_patched"}]}]; - r11b -> [{erl,[{release,"r11b_patched"}]}]; - r12b -> [{erl,[{release,"r12b_patched"}]}]; - r13b -> [{erl,[{release,"r13b_patched"}]}]; - r14b -> [{erl,[{release,"r14b_latest"}]}]; %naming convention changed - r15b -> [{erl,[{release,"r15b_latest"}]}]; r16b -> [{erl,[{release,"r16b_latest"}]}]; + '17' -> [{erl,[{release,"17_latest"}]}]; current -> [] end. dump_prefix(Rel) -> case Rel of - r9b -> "r9b_dump."; - r9c -> "r9c_dump."; - r10b -> "r10b_dump."; - r11b -> "r11b_dump."; - r12b -> "r12b_dump."; - r13b -> "r13b_dump."; - r14b -> "r14b_dump."; - r15b -> "r15b_dump."; r16b -> "r16b_dump."; - current -> "r17b_dump." + '17' -> "r17_dump."; + current -> "r18_dump." end. compat_rel(Rel) -> case Rel of - r9b -> "+R9 "; - r9c -> "+R9 "; - r10b -> "+R10 "; - r11b -> "+R11 "; - r12b -> "+R12 "; - r13b -> "+R13 "; - r14b -> "+R14 "; - r15b -> "+R15 "; r16b -> "+R16 "; + '17' -> "+R17 "; current -> "" end. |