3 files changed, 15 insertions, 18 deletions
diff --git a/lib/observer/src/cdv_wx.erl b/lib/observer/src/cdv_wx.erl
index 2587a6e64e..1e3fb6289e 100644
--- a/lib/observer/src/cdv_wx.erl
+++ b/lib/observer/src/cdv_wx.erl
@@ -17,7 +17,7 @@
 %%
 %% %CopyrightEnd%
 -module(cdv_wx).
--compile(export_all).
+
 -behaviour(wx_object).
 
 -export([start/1]).
diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl
index 4239a3d0d1..e57c8162e4 100644
--- a/lib/observer/test/crashdump_helper.erl
+++ b/lib/observer/test/crashdump_helper.erl
@@ -44,7 +44,7 @@ n1_proc(Creator,_N2,Pid2,Port2,_L) ->
     Ref = make_ref(),
     Pid = self(),
     Bin = list_to_binary(lists:seq(1, 255)),
-    SubBin = element(1, split_binary(element(2, split_binary(Bin, 8)), 17)),
+    <<_:2,SubBin:17/binary,_/bits>> = Bin,
 
     register(named_port,Port),
 
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 8df69c6624..1fd94ffb3c 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -101,7 +101,10 @@ end_per_group(_GroupName, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     delete_saved(Config),
     DataDir = ?config(data_dir,Config),
-    Rels = [R || R <- ['17','18'], ?t:is_release_available(R)] ++ [current],
+    CurrVsn = list_to_integer(erlang:system_info(otp_release)),
+    OldRels = [R || R <- [CurrVsn-2,CurrVsn-1],
+		    ?t:is_release_available(list_to_atom(integer_to_list(R)))],
+    Rels = OldRels ++ [current],
     io:format("Creating crash dumps for the following releases: ~p", [Rels]),
     AllDumps = create_dumps(DataDir,Rels),
     [{dumps,AllDumps}|Config].
@@ -612,23 +615,17 @@ dos_dump(DataDir,Rel,Dump) ->
 	    []
     end.
 
+rel_opt(current) ->
+    [];
 rel_opt(Rel) ->
-    case Rel of
-	'17' -> [{erl,[{release,"17_latest"}]}];
-	'18' -> [{erl,[{release,"18_latest"}]}];
-	current -> []
-    end.
+    [{erl,[{release,lists:concat([Rel,"_latest"])}]}].
 
+dump_prefix(current) ->
+    dump_prefix(erlang:system_info(otp_release));
 dump_prefix(Rel) ->
-    case Rel of
-	'17' -> "r17_dump.";
-	'18' -> "r18_dump.";
-	current -> "r19_dump."
-    end.
+    lists:concat(["r",Rel,"_dump."]).
 
+compat_rel(current) ->
+    "";
 compat_rel(Rel) ->
-    case Rel of
-	'17' -> "+R17 ";
-	'18' -> "+R18 ";
-	current -> ""
-    end.
+    lists:concat(["+R",Rel," "]).