diff options
author | Siri Hansen <siri@erlang.org> | 2016-05-04 10:18:41 +0200 |
---|---|---|
committer | Siri Hansen <siri@erlang.org> | 2016-05-04 10:18:41 +0200 |
commit | 26e05452a32bae7910f16b163a92dc17e502228c (patch) | |
tree | e35f1b136ca9005ea21e94c5f42ec3ab970283c4 /lib/observer/test | |
parent | f9721867e680a82731e62cdd9fddaf21d58fa347 (diff) | |
parent | 2a96db84ea2de90127cc1e841634ecb8adc57f14 (diff) | |
download | otp-26e05452a32bae7910f16b163a92dc17e502228c.tar.gz otp-26e05452a32bae7910f16b163a92dc17e502228c.tar.bz2 otp-26e05452a32bae7910f16b163a92dc17e502228c.zip |
Merge branch 'siri/cuddle-master'
* siri/cuddle-master:
Extend timer in test
Update crashdump_viewer_SUITE with new release numbers
Set longer timetrap when creating dsa files
Check that ssh application exists before starting netconf tests
Improve error control when starting ssh in netconf test
Diffstat (limited to 'lib/observer/test')
-rw-r--r-- | lib/observer/test/crashdump_viewer_SUITE.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl index a795c4fe25..73ed890802 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 <- [r16b,'17'], ?t:is_release_available(R)] ++ [current], + Rels = [R || R <- ['17','18'], ?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]. @@ -606,21 +606,21 @@ dos_dump(DataDir,Rel,Dump) -> rel_opt(Rel) -> case Rel of - r16b -> [{erl,[{release,"r16b_latest"}]}]; '17' -> [{erl,[{release,"17_latest"}]}]; + '18' -> [{erl,[{release,"18_latest"}]}]; current -> [] end. dump_prefix(Rel) -> case Rel of - r16b -> "r16b_dump."; '17' -> "r17_dump."; - current -> "r18_dump." + '18' -> "r18_dump."; + current -> "r19_dump." end. compat_rel(Rel) -> case Rel of - r16b -> "+R16 "; '17' -> "+R17 "; + '18' -> "+R18 "; current -> "" end. |