Remove workarounds for hybrid and shared heaps in test suites

4 files changed, 30 insertions, 114 deletions

diff --git a/lib/debugger/test/bs_construct_SUITE.erl b/lib/debugger/test/bs_construct_SUITE.erl
index cf943677be..e0bda7eac8 100644
--- a/lib/debugger/test/bs_construct_SUITE.erl
+++ b/lib/debugger/test/bs_construct_SUITE.erl
@@ -477,7 +477,6 @@ mem_leak(0, _) -> ok;
 mem_leak(N, B) ->
     ?line big_bin(B, <<23>>),
     ?line {'EXIT',{badarg,_}} = (catch big_bin(B, bad)),
-    maybe_gc(),
     mem_leak(N-1, B).
 
 big_bin(B1, B2) ->
@@ -490,13 +489,6 @@ big_bin(B1, B2) ->
 make_bin(0, Acc) -> Acc;
 make_bin(N, Acc) -> make_bin(N-1, <<Acc/binary,Acc/binary>>).
 
-maybe_gc() ->
-    case erlang:system_info(heap_type) of
-	shared -> erlang:garbage_collect();
-	hybrid -> erlang:garbage_collect();
-	private -> ok
-    end.
-
 -define(COF(Int0),
 	?line (fun(Int) ->
 		       true = <<Int:32/float>> =:= <<(float(Int)):32/float>>,
diff --git a/lib/kernel/test/bif_SUITE.erl b/lib/kernel/test/bif_SUITE.erl
index 6276270d20..a2826f34df 100644
--- a/lib/kernel/test/bif_SUITE.erl
+++ b/lib/kernel/test/bif_SUITE.erl
@@ -260,23 +260,15 @@ spawn_opt2(Config) when is_list(Config) ->
      ?line P1 = spawn_opt(fun() ->
  				 Parent ! {self(), fetch_proc_vals(self())}
  			 end,
- 			  case heap_type() of
-			      separate ->
-				  [{fullsweep_after, 0},{min_heap_size, 1000}];
-			      shared ->
-				  []
-			  end
-			  ++ [link, {priority, max}]),
+			  [{fullsweep_after, 0},{min_heap_size, 1000},
+			   link, {priority, max}]),
      ?line receive
  	      {P1, PV1} ->
  		  ?line Node = node(P1),
  		  ?line check_proc_vals(true, max, 0, 1000, PV1)
  	  end,
     ?line P2 = spawn_opt(fun() -> Parent ! {self(), fetch_proc_vals(self())} end,
-			 case heap_type() of
-			     separate -> [{min_heap_size, 10}];
-			     shared -> []
-			 end),
+			 [{min_heap_size, 10}]),
     ?line receive
 	      {P2, PV2} ->
 		  ?line Node = node(P2),
@@ -295,13 +287,8 @@ spawn_opt3(Config) when is_list(Config) ->
 			 fun() ->
 				 Parent ! {self(), fetch_proc_vals(self())}
 			 end,
-			 case heap_type() of
-			     separate ->
-				 [{fullsweep_after,0}, {min_heap_size,1000}];
-			     shared ->
-				 []
-			 end
-			 ++ [link, {priority, max}]),
+			 [{fullsweep_after,0}, {min_heap_size,1000},
+			  link, {priority, max}]),
     ?line receive
 	      {P1, PV1} ->
 		  ?line Node = node(P1),
@@ -309,10 +296,7 @@ spawn_opt3(Config) when is_list(Config) ->
 	  end,
     ?line P2 = spawn_opt(Node,
 			fun() -> Parent ! {self(), fetch_proc_vals(self())} end,
-			case heap_type() of
-			     separate -> [{min_heap_size, 10}];
-			     shared -> []
-			end),
+			 [{min_heap_size, 10}]),
     ?line receive
 	      {P2, PV2} ->
 		  ?line Node = node(P2),
@@ -333,13 +317,8 @@ spawn_opt4(Config) when is_list(Config) ->
 			 [fun() ->
 				  Parent ! {self(), fetch_proc_vals(self())}
 			  end],
-			 case heap_type() of
-			     separate ->
-				 [{fullsweep_after,0}, {min_heap_size,1000}];
-			     shared ->
-				 []
-			 end
-			 ++ [link, {priority, max}]),
+			 [{fullsweep_after,0}, {min_heap_size,1000},
+			  link, {priority, max}]),
     ?line receive
 	      {P1, PV1} ->
 		  ?line Node = node(P1),
@@ -350,10 +329,7 @@ spawn_opt4(Config) when is_list(Config) ->
 			 [fun() ->
 				  Parent ! {self(), fetch_proc_vals(self())}
 			  end],
-			 case heap_type() of
-			     separate -> [{min_heap_size, 10}];
-			     shared -> []
-			 end),
+			     [{min_heap_size, 10}]),
     ?line receive
 	      {P2, PV2} ->
 		  ?line Node = node(P2),
@@ -374,13 +350,8 @@ spawn_opt5(Config) when is_list(Config) ->
 			 [fun() ->
 				  Parent ! {self(), fetch_proc_vals(self())}
 			  end],
-			 case heap_type() of
-			     separate ->
-				 [{fullsweep_after,0}, {min_heap_size,1000}];
-			     shared ->
-				 []
-			 end
-			 ++ [link, {priority, max}]),
+			 [{fullsweep_after,0}, {min_heap_size,1000},
+			  link, {priority, max}]),
     ?line receive
 	      {P1, PV1} ->
 		  ?line Node = node(P1),
@@ -392,10 +363,7 @@ spawn_opt5(Config) when is_list(Config) ->
 			 [fun() ->
 				  Parent ! {self(), fetch_proc_vals(self())}
 			  end],
-			 case heap_type() of
-			     separate -> [{min_heap_size, 10}];
-			     shared -> []
-			 end),
+			  [{min_heap_size, 10}]),
     ?line receive
 	      {P2, PV2} ->
 		  ?line Node = node(P2),
@@ -532,34 +500,19 @@ spawn_failures(Config) when is_list(Config) ->
 check_proc_vals(Link, Priority, FullsweepAfter, MinHeapSize, {Ls, P, FA, HS}) ->
     ?line Link = lists:member(self(), Ls),
     ?line Priority = P,
-    ?line case heap_type() of
-	      separate ->
-		  ?line FullsweepAfter = FA,
-		  ?line true = (HS >= MinHeapSize);
-	      shared ->
-		  ?line ok
-	  end,
+    FullsweepAfter = FA,
+    true = (HS >= MinHeapSize),
     ?line ok.
 
 fetch_proc_vals(Pid) ->
     ?line PI = process_info(Pid),
     ?line {value,{links, Ls}} = lists:keysearch(links, 1, PI),
     ?line {value,{priority,P}} = lists:keysearch(priority, 1, PI),
-    ?line {FA, HS}
-	= case heap_type() of
-	      separate ->
-		  ?line {value,
-			 {garbage_collection,
-			  Gs}} = lists:keysearch(garbage_collection, 1, PI),
-		  ?line {value,
-			 {fullsweep_after,
-			  Fa}} = lists:keysearch(fullsweep_after, 1, Gs),
-		  ?line {value,
-			 {heap_size,Hs}} = lists:keysearch(heap_size, 1, PI),
-		  ?line {Fa, Hs};
-	      shared ->
-		  {undefined, undefined}
-	  end,
+    {value,{garbage_collection,Gs}} =
+	lists:keysearch(garbage_collection, 1, PI),
+    {value,{fullsweep_after,FA}} =
+	lists:keysearch(fullsweep_after, 1, Gs),
+    {value,{heap_size,HS}} = lists:keysearch(heap_size, 1, PI),
     ?line {Ls, P, FA, HS}.
      
 % This testcase should probably be moved somewhere else
@@ -650,12 +603,3 @@ stop_node(Node) ->
 
 run_fun(Fun) ->
     Fun().
-
-heap_type() ->
-    case catch erlang:system_info(heap_type) of
-	shared   -> shared;
-	unified  -> shared;
-	_        -> separate
-    end.
-    
-
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 954d19a46f..297c4ec1c9 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -715,30 +715,17 @@ adjust_xmem([T1,T2,T3,T4], {A0,B0,C0,D0} = _Mem0) ->
     TabDiff = ?TAB_STRUCT_SZ,
     Mem1 = {A0+TabDiff, B0+TabDiff, C0+TabDiff, D0+TabDiff},
 
-    Mem2 = case {erlang:system_info({wordsize,internal}),erlang:system_info({wordsize,external})} of
-	         %% Halfword, corrections for regular pointers occupying two internal words.
-		 {4,8} ->
-			{A1,B1,C1,D1} = Mem1,
-			{A1+4*ets:info(T1, size)+?DB_TREE_STACK_NEED,
-			 B1+3*ets:info(T2, size)+?DB_HASH_SIZEOF_EXTSEG,
-			 C1+3*ets:info(T3, size)+?DB_HASH_SIZEOF_EXTSEG,
-			 D1+3*ets:info(T4, size)+?DB_HASH_SIZEOF_EXTSEG};
-		 _ ->
-			Mem1
-		end,
-
-    %% Adjust for hybrid and shared heaps:
-    %%   Each record is one word smaller.
-    %%Mem2 = case erlang:system_info(heap_type) of
-    %%    	   private ->
-    %%    	       Mem1;
-    %%    	   _ ->
-    %%    	       {A1,B1,C1,D1} = Mem1,
-    %%    	       {A1-ets:info(T1, size),B1-ets:info(T2, size),
-    %%    		C1-ets:info(T3, size),D1-ets:info(T4, size)}
-    %%          end,
-    %%{Mem2,{ets:info(T1,stats),ets:info(T2,stats),ets:info(T3,stats),ets:info(T4,stats)}}.
-    Mem2.
+    case {erlang:system_info({wordsize,internal}),erlang:system_info({wordsize,external})} of
+	%% Halfword, corrections for regular pointers occupying two internal words.
+	{4,8} ->
+	    {A1,B1,C1,D1} = Mem1,
+	    {A1+4*ets:info(T1, size)+?DB_TREE_STACK_NEED,
+	     B1+3*ets:info(T2, size)+?DB_HASH_SIZEOF_EXTSEG,
+	     C1+3*ets:info(T3, size)+?DB_HASH_SIZEOF_EXTSEG,
+	     D1+3*ets:info(T4, size)+?DB_HASH_SIZEOF_EXTSEG};
+	_ ->
+	    Mem1
+    end.
 
 t_whitebox(doc) ->
     ["Diverse whitebox testes"];
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 576d7e261c..0cd53a05db 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -574,14 +574,7 @@ otp_5418(Config) when is_list(Config) ->
 
     ok.
 
-otp_6115(suite) -> [];
 otp_6115(Config) when is_list(Config) ->
-    case erlang:system_info(heap_type) of
-	hybrid -> {skip,"Hybrid-heap emulator doesn't keep track of funs"};
-	_ -> otp_6115_1(Config)
-    end.
-
-otp_6115_1(Config) ->
     ?line {ok, CWD} = file:get_cwd(),
     ?line Dir = filename:join(?config(data_dir, Config), otp_6115),
     ?line ok = file:set_cwd(Dir),