Remove redundant tests for native code

4 files changed, 10 insertions, 45 deletions

diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl
index 39239a66a9..51057a514e 100644
--- a/lib/tools/test/cprof_SUITE.erl
+++ b/lib/tools/test/cprof_SUITE.erl
@@ -64,9 +64,7 @@ config(data_dir, _) ->
     "cprof_SUITE_data".
 -else.
 %% When run in test server.
--export([all/0, suite/0,
-         init_per_testcase/2, end_per_testcase/2,
-         not_run/1]).
+-export([all/0, suite/0, init_per_testcase/2, end_per_testcase/2]).
 -export([basic/1, on_load/1, modules/1]).
 
 init_per_testcase(_Case, Config) ->
@@ -82,15 +80,8 @@ suite() ->
     [{ct_hooks,[ts_install_cth]},
      {timetrap,{seconds,30}}].
 
-all() -> 
-    case test_server:is_native(cprof_SUITE) of
-        true -> [not_run];
-        false -> [basic, on_load, modules]
-    end.
-
-
-not_run(Config) when is_list(Config) -> 
-    {skipped,"Native code"}.
+all() ->
+    [basic, on_load, modules].
 
 %% Tests basic profiling
 basic(Config) when is_list(Config) ->
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 4578b15cdb..7a4c503ec2 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -108,13 +108,6 @@ basic(Config) when is_list(Config) ->
     ok.
 
 basic_option(Config) when is_list(Config) ->
-    %% Eprof is not supported on native-compile code.
-    case lists:module_info(native_addresses) of
-	[] -> basic_option_1(Config);
-	[_|_] -> {skip,"lists is native-compiled"}
-    end.
-
-basic_option_1(Config) ->
 
     %% load eprof_test and change directory
 
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index f5d68c20f0..df4c6d8b0f 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -22,7 +22,7 @@
 -include_lib("common_test/include/ct.hrl").
 
 %% Test server framework exports
--export([all/0, suite/0, not_run/1]).
+-export([all/0, suite/0]).
 
 %% Test suites
 -export([stack_seq/1, tail_seq/1, create_file_slow/1, spawn_simple/1,
@@ -53,18 +53,10 @@ suite() ->
     [{ct_hooks,[ts_install_cth]},
      {timetrap,{seconds,240}}].
 
-all() -> 
-    case test_server:is_native(fprof_SUITE) of
-        true -> [not_run];
-        false ->
-            [stack_seq, tail_seq, create_file_slow, spawn_simple,
-             imm_tail_seq, imm_create_file_slow, imm_compile,
-             cpu_create_file_slow, unicode, parsify_maps]
-    end.
-
-
-not_run(Config) when is_list(Config) ->
-    {skipped, "Native code"}.
+all() ->
+    [stack_seq, tail_seq, create_file_slow, spawn_simple,
+     imm_tail_seq, imm_create_file_slow, imm_compile,
+     cpu_create_file_slow, unicode, parsify_maps].
 
 %%%---------------------------------------------------------------------
 
@@ -164,15 +156,6 @@ tail_seq(Config) when is_list(Config) ->
 
 %% Tests the create_file_slow benchmark.
 create_file_slow(Config) ->
-    case test_server:is_native(lists) orelse
-         test_server:is_native(file) of
-        true ->
-            {skip,"Native libs -- tracing does not work"};
-        false ->
-            do_create_file_slow(Config)
-    end.
-
-do_create_file_slow(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     TraceFile = filename:join(PrivDir,
                               ?MODULE_STRING"_create_file_slow.trace"),
diff --git a/lib/tools/test/prof_bench_SUITE.erl b/lib/tools/test/prof_bench_SUITE.erl
index c0b9a7913c..b1463e084d 100644
--- a/lib/tools/test/prof_bench_SUITE.erl
+++ b/lib/tools/test/prof_bench_SUITE.erl
@@ -38,12 +38,10 @@ all() ->
     [overhead].
 
 init_per_suite(Config) ->
-    case {test_server:is_native(fprof_SUITE) or
-          (lists:any(fun(M) -> test_server:is_native(M) end, modules())) or
-          (whereis(cover_server) =/= undefined),
+    case {whereis(cover_server) =/= undefined,
           erlang:system_info(wordsize)}
     of
-        {true, _} -> {skip, "Native or cover code"};
+        {true, _} -> {skip, "Cover is running"};
         {_, 4} -> {skip, "Can't run on 32-bit as files will be large"};
         {false, 8} -> Config
     end.