From e64d80a565de01e7a2493e2072967af6ddea29a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Tue, 1 Apr 2014 15:22:26 +0200
Subject: emulator: Increase timetrap timeout for match_spec_SUITE

---
 erts/emulator/test/match_spec_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl
index 330bef7104..8038888796 100644
--- a/erts/emulator/test/match_spec_SUITE.erl
+++ b/erts/emulator/test/match_spec_SUITE.erl
@@ -42,7 +42,7 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:seconds(10)),
+    Dog=?t:timetrap(?t:seconds(30)),
     [{watchdog, Dog}|Config].
 
 end_per_testcase(_Func, Config) ->
-- 
cgit v1.2.3


From 59330b43ad3f4856885f43ecaeb4df2c26d92630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Tue, 1 Apr 2014 16:00:06 +0200
Subject: emulator: Increase timetrap timeout for binary_SUITE

---
 erts/emulator/test/binary_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 938aac6a0e..5da69c2cab 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -64,7 +64,7 @@
 -export([sleeper/0,trapping_loop/4]).
 
 suite() -> [{ct_hooks,[ts_install_cth]},
-	    {timetrap,{minutes,2}}].
+	    {timetrap,{minutes,4}}].
 
 all() -> 
     [copy_terms, conversions, deep_lists, deep_bitstr_lists,
-- 
cgit v1.2.3


From b8be5e68c8c7015c97a2f62fc3830b86e7a7bc5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Tue, 1 Apr 2014 17:10:31 +0200
Subject: tools: Refactor testcase

---
 lib/tools/test/eprof_SUITE.erl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 1227d5b841..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
 
@@ -149,8 +149,7 @@ basic_option_1(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),
@@ -159,8 +158,7 @@ basic_option_1(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),
@@ -255,3 +253,5 @@ ensure_eprof_stopped() ->
 	Pid ->
 	    stopped=eprof:stop()
     end.
+
+id(I) -> I.
-- 
cgit v1.2.3