aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-04-02 15:38:38 +0200
committerBjörn-Egil Dahlberg <[email protected]>2014-04-02 15:38:38 +0200
commiteba291a52d4a78c128c5802775fa1bff187e0604 (patch)
tree4849eb0e7b375ad041c2fb1abd11722c4e4e6a93 /erts/emulator/test
parent5def902915e6cd583ee52a06826fa85c770c0c48 (diff)
parentb8be5e68c8c7015c97a2f62fc3830b86e7a7bc5b (diff)
downloadotp-eba291a52d4a78c128c5802775fa1bff187e0604.tar.gz
otp-eba291a52d4a78c128c5802775fa1bff187e0604.tar.bz2
otp-eba291a52d4a78c128c5802775fa1bff187e0604.zip
Merge branch 'egil/test-cuddling'
* egil/test-cuddling: tools: Refactor testcase emulator: Increase timetrap timeout for binary_SUITE emulator: Increase timetrap timeout for match_spec_SUITE
Diffstat (limited to 'erts/emulator/test')
-rw-r--r--erts/emulator/test/binary_SUITE.erl2
-rw-r--r--erts/emulator/test/match_spec_SUITE.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 2ca51bfac4..7aba367e33 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,
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) ->