diff options
| author | Björn Gustavsson <[email protected]> | 2017-06-07 16:43:44 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-06-07 16:43:44 +0200 |
| commit | 2cd892c67dcb8d88e33decc2f92cf4bc776497ad (patch) | |
| tree | e47829ba4dd70af7509c16420e8eab8ecd4bf418 /erts/emulator/test/nested_SUITE.erl | |
| parent | 76137cbf49487e07bfcd72d5789bdfde7ef50a92 (diff) | |
| parent | 46b62dea54a230e46bbadfec7f119ff5ab513e6a (diff) | |
| download | otp-2cd892c67dcb8d88e33decc2f92cf4bc776497ad.tar.gz otp-2cd892c67dcb8d88e33decc2f92cf4bc776497ad.tar.bz2 otp-2cd892c67dcb8d88e33decc2f92cf4bc776497ad.zip | |
Merge branch 'bjorn/cuddle-with-tests'
* bjorn/cuddle-with-tests:
Stabilize call_with_huge_message_queue/1
same_time_yielding/1: Avoid failing if there are many schedulers
Remove obsolete old_scheduler_SUITE
Robustify process_SUITE:spawn_opt_max_heap_size/1
Contain damage cause by spawn_opt_max_heap_size failing
Make bulk_send_bigbig/1 purely informational
distribution_SUITE: Refactor bulk_send_bigbig/1
receive_SUITE: Remove ?line macros
Lengthen too short timetraps
Fix process_SUITE:low_prio/1
Diffstat (limited to 'erts/emulator/test/nested_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/nested_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/nested_SUITE.erl b/erts/emulator/test/nested_SUITE.erl index 7af2873ce2..5059317172 100644 --- a/erts/emulator/test/nested_SUITE.erl +++ b/erts/emulator/test/nested_SUITE.erl @@ -27,7 +27,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}, - {timetrap, {seconds, 10}}]. + {timetrap, {minutes, 1}}]. all() -> [case_in_case, case_in_after, catch_in_catch, |