diff options
| author | Björn Gustavsson <[email protected]> | 2012-02-07 08:31:03 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-02-07 08:31:03 +0100 |
| commit | d4332565d1a6480fe46fd72284e39dbf4670327e (patch) | |
| tree | 6332b544627aca61665abbae8c7203cb9e74379e /lib/debugger | |
| parent | 7ec7e60aea883bbc7d09e7dd6b68061ee8c6b15b (diff) | |
| parent | f028f375e7e7bc1f859e247651c5ddb816bdd208 (diff) | |
| download | otp-d4332565d1a6480fe46fd72284e39dbf4670327e.tar.gz otp-d4332565d1a6480fe46fd72284e39dbf4670327e.tar.bz2 otp-d4332565d1a6480fe46fd72284e39dbf4670327e.zip | |
Merge branch 'bjorn/hipe-test-cases' into maint
* bjorn/hipe-test-cases:
debugger tests: Increase time trap timeout
fprof_SUITE: Skip create_file_slow/1 if libraries are native
etop_SUITE: Skip a test case if libraries are native-compiled
Skip all inviso test cases if libraries are native-compiled
erl_prim_loader_SUITE: Handle native-compiled erl_boot_server
re_SUITE: Skip error_handling/1 if 're' is native code
shell_SUITE: Handle different EXIT reasons from native code
sofs_SUITE: Handle different EXIT reasons from native code
erl_eval_SUITE: Skip test of parameterized modules if native code
trace_port_SUITE: Skip test cases if 'lists' is native-compiled
call_trace_SUITE: Skip test cases if libraries are native-compiled
Diffstat (limited to 'lib/debugger')
| -rw-r--r-- | lib/debugger/test/bs_construct_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/debugger/test/bs_match_misc_SUITE.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/debugger/test/bs_construct_SUITE.erl b/lib/debugger/test/bs_construct_SUITE.erl index 187c9f53b0..fa7b40ff1e 100644 --- a/lib/debugger/test/bs_construct_SUITE.erl +++ b/lib/debugger/test/bs_construct_SUITE.erl @@ -56,7 +56,7 @@ end_per_group(_GroupName, Config) -> init_per_testcase(_Case, Config) -> test_lib:interpret(?MODULE), - Dog = test_server:timetrap(?t:minutes(1)), + Dog = test_server:timetrap(?t:minutes(15)), [{watchdog,Dog}|Config]. end_per_testcase(_Case, Config) -> diff --git a/lib/debugger/test/bs_match_misc_SUITE.erl b/lib/debugger/test/bs_match_misc_SUITE.erl index 89fce263f5..ec3746d76a 100644 --- a/lib/debugger/test/bs_match_misc_SUITE.erl +++ b/lib/debugger/test/bs_match_misc_SUITE.erl @@ -57,7 +57,7 @@ end_per_suite(Config) when is_list(Config) -> init_per_testcase(_Case, Config) -> test_lib:interpret(?MODULE), - Dog = test_server:timetrap(?t:minutes(1)), + Dog = test_server:timetrap(?t:minutes(15)), [{watchdog,Dog}|Config]. end_per_testcase(_Case, Config) -> |