1 files changed, 13 insertions, 5 deletions
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 26685a6a84..04b522de4a 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -104,7 +104,7 @@ basic(Config) when is_list(Config) ->
     profiling = eprof:profile([A]),
     true      = exit(A, kill_it),
     profiling_stopped = eprof:stop_profiling(),
-    {error,_} = eprof:profile(fun() -> a = b end),
+    {error,_} = eprof:profile(fun() -> a = id(b) end),
 
     %% with mfa
 
@@ -127,6 +127,14 @@ 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
 
     {ok, OldCurDir} = file:get_cwd(),
@@ -141,8 +149,7 @@ basic_option(Config) when is_list(Config) ->
     % vanilla
     {ok, _} = eprof:profile(fun() -> eprof_test:do(10) end, [{set_on_spawn, true}]),
 
-    [{_, MfasDo1},{_, MfasLists1}] = eprof:dump(),
-    Mfas1 = MfasDo1 ++ MfasLists1,
+    Mfas1 = lists:foldl(fun({_,Mfas},Out) -> Mfas ++ Out end, [], eprof:dump()),
 
     {value, {_, {11, _}}} = lists:keysearch({eprof_test,dec,1},  1, Mfas1),
     {value, {_, { 1, _}}} = lists:keysearch({eprof_test, go,1},  1, Mfas1),
@@ -151,8 +158,7 @@ basic_option(Config) when is_list(Config) ->
 
     {ok, _} = eprof:profile(fun() -> eprof_test:do(10) end, [set_on_spawn]),
 
-    [{_, MfasDo2},{_, MfasLists2}] = eprof:dump(),
-    Mfas2 = MfasDo2 ++ MfasLists2,
+    Mfas2 = lists:foldl(fun({_,Mfas},Out) -> Mfas ++ Out end, [], eprof:dump()),
     {value, {_, {11, _}}} = lists:keysearch({eprof_test,dec,1},  1, Mfas2),
     {value, {_, { 1, _}}} = lists:keysearch({eprof_test, go,1},  1, Mfas2),
     {value, {_, { 9, _}}} = lists:keysearch({lists, split_2,5},  1, Mfas2),
@@ -247,3 +253,5 @@ ensure_eprof_stopped() ->
 	Pid ->
 	    stopped=eprof:stop()
     end.
+
+id(I) -> I.