aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2017-01-17 16:05:43 +0100
committerBjörn-Egil Dahlberg <[email protected]>2017-01-17 16:05:43 +0100
commit6927f85ed386ea3c0f43bd042ea4c917103d76a2 (patch)
tree32e0974dcec0c7ac1589da40ecf800d03451afa5 /lib/compiler
parent9b6643e4c573e4a5536a48f8115f12d0b99f9d41 (diff)
parente1b844db68a770d7d519ff62de827ffba90213b1 (diff)
downloadotp-6927f85ed386ea3c0f43bd042ea4c917103d76a2.tar.gz
otp-6927f85ed386ea3c0f43bd042ea4c917103d76a2.tar.bz2
otp-6927f85ed386ea3c0f43bd042ea4c917103d76a2.zip
Merge branch 'egil/cuddle-tests' into maint
* egil/cuddle-tests: stdlib: Increase timetrap for rand_SUITE common_test: Increase timetrap for cth_hooks_SUITE compiler: Increase timetrap timeouts for lc_SUITE
Diffstat (limited to 'lib/compiler')
-rw-r--r--lib/compiler/test/lc_SUITE.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/compiler/test/lc_SUITE.erl b/lib/compiler/test/lc_SUITE.erl
index 3cb49433ce..adb96fb87d 100644
--- a/lib/compiler/test/lc_SUITE.erl
+++ b/lib/compiler/test/lc_SUITE.erl
@@ -19,7 +19,7 @@
%%
-module(lc_SUITE).
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
+-export([all/0, suite/0, groups/0, init_per_suite/1, end_per_suite/1,
init_per_group/2,end_per_group/2,
init_per_testcase/2,end_per_testcase/2,
basic/1,deeply_nested/1,no_generator/1,
@@ -32,11 +32,11 @@ suite() ->
[{ct_hooks,[ts_install_cth]},
{timetrap,{minutes,1}}].
-all() ->
+all() ->
test_lib:recompile(?MODULE),
[{group,p}].
-groups() ->
+groups() ->
[{p,test_lib:parallel(),
[basic,
deeply_nested,
@@ -214,6 +214,7 @@ shadow(Config) when is_list(Config) ->
ok.
effect(Config) when is_list(Config) ->
+ ct:timetrap({minutes,10}),
[{42,{a,b,c}}] =
do_effect(fun(F, L) ->
[F({V1,V2}) ||
@@ -240,7 +241,7 @@ do_effect(Lc, L) ->
lists:reverse(erase(?MODULE)).
id(I) -> I.
-
+
fc(Args, {'EXIT',{function_clause,[{?MODULE,_,Args,_}|_]}}) -> ok;
fc(Args, {'EXIT',{function_clause,[{?MODULE,_,Arity,_}|_]}})
when length(Args) =:= Arity ->