Fix testcases after removal of non-smp emulator

2 files changed, 17 insertions, 35 deletions

diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index aa616d43d6..8364fe7cdc 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -295,21 +295,9 @@ bad_address(Config) when is_list(Config) ->
 %% are received per in/out scheduling, which should be
 %% the same as the read_packets parameter.
 %% 
-%% What happens on the SMP emulator remains to be seen...
-%%
 
 %% OTP-6249 UDP option for number of packet reads.
 read_packets(Config) when is_list(Config) ->
-    case erlang:system_info(smp_support) of
-	false ->
-	    read_packets_1();
-	true ->
-	    %% We would need some new sort of tracing to test this
-	    %% option reliably in an SMP emulator.
-	    {skip,"SMP emulator"}
-    end.
-
-read_packets_1() ->
     N1 = 5,
     N2 = 7,
     {ok,R} = gen_udp:open(0, [{read_packets,N1}]),
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index 4b67fce9a8..a44ef106d3 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -885,29 +885,23 @@ split_bin(Last,Acc) ->
 
 %% Check concurrent access to zlib driver.
 smp(Config) ->
-    case erlang:system_info(smp_support) of
-	true ->
-	    NumOfProcs = lists:min([8,erlang:system_info(schedulers)]),
-	    io:format("smp starting ~p workers\n",[NumOfProcs]),
-
-	    %% Tests to run in parallel.
-	    Funcs = [zip_usage, gz_usage, compress_usage, dictionary_usage,
-		     crc, adler],
-
-	    %% We get all function arguments here to avoid repeated parallel
-	    %% file read access.
-	    FnAList = lists:map(fun(F) -> {F,?MODULE:F({get_arg,Config})}
-				end, Funcs),	    
-
-	    Pids = [spawn_link(?MODULE, worker, [rand:uniform(9999),
-						 list_to_tuple(FnAList),
-						 self()])
-		    || _ <- lists:seq(1,NumOfProcs)],
-	    wait_pids(Pids);
-
-	false ->
-	    {skipped,"No smp support"}
-    end.
+    NumOfProcs = lists:min([8,erlang:system_info(schedulers)]),
+    io:format("smp starting ~p workers\n",[NumOfProcs]),
+
+    %% Tests to run in parallel.
+    Funcs = [zip_usage, gz_usage, compress_usage, dictionary_usage,
+             crc, adler],
+
+    %% We get all function arguments here to avoid repeated parallel
+    %% file read access.
+    FnAList = lists:map(fun(F) -> {F,?MODULE:F({get_arg,Config})}
+                        end, Funcs),
+
+    Pids = [spawn_link(?MODULE, worker, [rand:uniform(9999),
+                                         list_to_tuple(FnAList),
+                                         self()])
+            || _ <- lists:seq(1,NumOfProcs)],
+    wait_pids(Pids).
 
 
 worker(Seed, FnATpl, Parent) ->