Merge branch 'bjorn/cuddle-with-tests'

* bjorn/cuddle-with-tests:
  With --enable-native-libs, skip eprof_SUITE:basic_option/1
  Speed up bs_construct_SUITE:dynamic/1

2 files changed, 32 insertions, 16 deletions

diff --git a/lib/debugger/test/bs_construct_SUITE.erl b/lib/debugger/test/bs_construct_SUITE.erl
index 4870c87d74..8a6798c6ad 100644
--- a/lib/debugger/test/bs_construct_SUITE.erl
+++ b/lib/debugger/test/bs_construct_SUITE.erl
@@ -647,19 +647,27 @@ make_sub_bin(Bin0) ->
 %% give the same result.
 
 dynamic(Config) when is_list(Config) ->
-    ?line dynamic_1(fun dynamic_big/5),
-    ?line dynamic_1(fun dynamic_little/5),
+    Ps = [spawn_monitor(fun() ->
+				dynamic_1(Fun)
+			end) || Fun <- [fun dynamic_big/5,
+					fun dynamic_little/5]],
+    [receive
+	 {'DOWN',Ref,process,Pid,normal} ->
+	     ok;
+	 {'DOWN',Ref,process,Pid,Exit} ->
+	     ?t:fail({Pid,Exit})
+     end || {Pid,Ref} <- Ps],
     ok.
 
 dynamic_1(Dynamic) ->
-    <<Lpad:128>> = erlang:md5([0]),
-    <<Rpad:128>> = erlang:md5([1]),
-    <<Int:128>> = erlang:md5([2]),
-    8385 = dynamic_2(0, {Int,Lpad,Rpad,Dynamic}, 0).
+    <<Lpad:64,_/binary>> = erlang:md5([0]),
+    <<Rpad:64,_/binary>> = erlang:md5([1]),
+    <<Int:64,_/binary>> = erlang:md5([2]),
+    2145 = dynamic_2(0, {Int,Lpad,Rpad,Dynamic}, 0).
 
-dynamic_2(129, _, Count) -> Count;
+dynamic_2(64+1, _, Count) -> Count;
 dynamic_2(Bef, Data, Count0) ->
-    Count = dynamic_3(Bef, 128-Bef, Data, Count0),
+    Count = dynamic_3(Bef, 64-Bef, Data, Count0),
     dynamic_2(Bef+1, Data, Count).
 
 dynamic_3(_, -1, _, Count) -> Count;
@@ -680,13 +688,13 @@ dynamic_big(Bef, N, Int, Lpad, Rpad) ->
     <<MaskedInt:N>> = NumBin,
 
     %% Construct the binary in two different ways.
-    Bin = id(<<Lpad:Bef,NumBin/bitstring,Rpad:(128-Bef-N)>>),
-    Bin = <<Lpad:Bef,Int:N,Rpad:(128-Bef-N)>>,
+    Bin = id(<<Lpad:Bef,NumBin/bitstring,Rpad:(64-Bef-N)>>),
+    Bin = <<Lpad:Bef,Int:N,Rpad:(64-Bef-N)>>,
 
     %% Further verify the result by matching.
     LpadMasked = Lpad band ((1 bsl Bef) - 1),
-    RpadMasked = Rpad band ((1 bsl (128-Bef-N)) - 1),
-    Rbits = (128-Bef-N),
+    RpadMasked = Rpad band ((1 bsl (64-Bef-N)) - 1),
+    Rbits = (64-Bef-N),
     <<LpadMasked:Bef,MaskedInt:N,RpadMasked:Rbits>> = id(Bin),
     ok.
 
@@ -696,13 +704,13 @@ dynamic_little(Bef, N, Int, Lpad, Rpad) ->
     <<MaskedInt:N/little>> = NumBin,
 
     %% Construct the binary in two different ways.
-    Bin = id(<<Lpad:Bef/little,NumBin/bitstring,Rpad:(128-Bef-N)/little>>),
-    Bin = <<Lpad:Bef/little,Int:N/little,Rpad:(128-Bef-N)/little>>,
+    Bin = id(<<Lpad:Bef/little,NumBin/bitstring,Rpad:(64-Bef-N)/little>>),
+    Bin = <<Lpad:Bef/little,Int:N/little,Rpad:(64-Bef-N)/little>>,
 
     %% Further verify the result by matching.
     LpadMasked = Lpad band ((1 bsl Bef) - 1),
-    RpadMasked = Rpad band ((1 bsl (128-Bef-N)) - 1),
-    Rbits = (128-Bef-N),
+    RpadMasked = Rpad band ((1 bsl (64-Bef-N)) - 1),
+    Rbits = (64-Bef-N),
     <<LpadMasked:Bef/little,MaskedInt:N/little,RpadMasked:Rbits/little>> = id(Bin),
     ok.
 
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 26685a6a84..1227d5b841 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -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(),