aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/lttng_SUITE.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-06-07 16:43:44 +0200
committerBjörn Gustavsson <[email protected]>2017-06-07 16:43:44 +0200
commit2cd892c67dcb8d88e33decc2f92cf4bc776497ad (patch)
treee47829ba4dd70af7509c16420e8eab8ecd4bf418 /erts/emulator/test/lttng_SUITE.erl
parent76137cbf49487e07bfcd72d5789bdfde7ef50a92 (diff)
parent46b62dea54a230e46bbadfec7f119ff5ab513e6a (diff)
downloadotp-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/lttng_SUITE.erl')
-rw-r--r--erts/emulator/test/lttng_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/lttng_SUITE.erl b/erts/emulator/test/lttng_SUITE.erl
index c12f63706a..1c1952f912 100644
--- a/erts/emulator/test/lttng_SUITE.erl
+++ b/erts/emulator/test/lttng_SUITE.erl
@@ -40,7 +40,7 @@
suite() ->
[{ct_hooks,[ts_install_cth]},
- {timetrap, {seconds, 10}}].
+ {timetrap, {minutes, 1}}].
all() ->
[t_lttng_list,