aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-03-18 12:33:51 +0100
committerBjörn Gustavsson <[email protected]>2016-03-18 12:33:51 +0100
commit7e13621fccd53a368b1717495382ae86239ed65b (patch)
tree454ec561682912801c4755b285d9457665097751
parent5b38a4a2543681cde7289eff98cdb078ea2ee1fa (diff)
downloadotp-7e13621fccd53a368b1717495382ae86239ed65b.tar.gz
otp-7e13621fccd53a368b1717495382ae86239ed65b.tar.bz2
otp-7e13621fccd53a368b1717495382ae86239ed65b.zip
Modernize timetraps
-rw-r--r--lib/asn1/test/asn1_SUITE.erl14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 7214c4b300..2d7d2185c5 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -34,7 +34,9 @@
%% Suite definition
%%------------------------------------------------------------------------------
-suite() -> [{ct_hooks, [ts_install_cth]}].
+suite() ->
+ [{ct_hooks, [ts_install_cth]},
+ {timetrap,{minutes,60}}].
all() ->
[{group, compile},
@@ -197,12 +199,7 @@ init_per_testcase(Func, Config) ->
CaseDir = filename:join(?config(priv_dir, Config), Func),
ok = filelib:ensure_dir(filename:join([CaseDir, dummy_file])),
true = code:add_patha(CaseDir),
-
- Dog = case Func of
- testRfcs -> ct:timetrap({minutes, 90});
- _ -> ct:timetrap({minutes, 60})
- end,
- [{case_dir, CaseDir}, {watchdog, Dog}|Config].
+ [{case_dir, CaseDir}|Config].
end_per_testcase(_Func, Config) ->
code:del_path(?config(case_dir, Config)).
@@ -993,6 +990,9 @@ testS1AP(Config, Rule, Opts) ->
ok
end.
+testRfcs() ->
+ [{timetrap,{minutes,90}}].
+
testRfcs(Config) -> test(Config, fun testRfcs/3, [{ber,[der]}]).
testRfcs(Config, Rule, Opts) ->
case erlang:system_info(system_architecture) of