aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-06-01 15:45:21 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-06-01 15:45:21 +0200
commitaf012bcbf2d6a5edd5b7c0e49bc76f7d2c3196e2 (patch)
treef79be74b41c5e09b96b029644382eac86b3a4907 /erts
parent77b6b9a3c5d044a832ba36f8683bbe88279d8c88 (diff)
parent034394661dc1b2467825b58f6264874f6940c279 (diff)
downloadotp-af012bcbf2d6a5edd5b7c0e49bc76f7d2c3196e2.tar.gz
otp-af012bcbf2d6a5edd5b7c0e49bc76f7d2c3196e2.tar.bz2
otp-af012bcbf2d6a5edd5b7c0e49bc76f7d2c3196e2.zip
Merge branch 'egil/lttng-cuddle-tests'
* egil/lttng-cuddle-tests: erts: Cuddle with lttng_SUITE runtime_tools: Cuddle with t_receive tests
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/lttng_SUITE.erl8
1 files changed, 6 insertions, 2 deletions
diff --git a/erts/emulator/test/lttng_SUITE.erl b/erts/emulator/test/lttng_SUITE.erl
index c64ddc40da..1360751aee 100644
--- a/erts/emulator/test/lttng_SUITE.erl
+++ b/erts/emulator/test/lttng_SUITE.erl
@@ -44,6 +44,7 @@ suite() ->
all() ->
[t_lttng_list,
+ t_memory_carrier,
t_carrier_pool,
t_async_io_pool,
t_driver_start_stop,
@@ -52,8 +53,7 @@ all() ->
t_driver_timeout,
t_driver_caller,
t_driver_flush,
- t_scheduler_poll,
- t_memory_carrier].
+ t_scheduler_poll].
init_per_suite(Config) ->
@@ -178,11 +178,13 @@ t_async_io_pool(Config) ->
%% com_ericsson_otp:driver_stop
t_driver_start_stop(Config) ->
ok = lttng_start_event("com_ericsson_otp:driver_*", Config),
+ timer:sleep(500),
Path = proplists:get_value(priv_dir, Config),
Name = filename:join(Path, "sometext.txt"),
Bin = txt(),
ok = file:write_file(Name, Bin),
{ok, Bin} = file:read_file(Name),
+ timer:sleep(500),
Res = lttng_stop_and_view(Config),
ok = check_tracepoint("com_ericsson_otp:driver_start", Res),
ok = check_tracepoint("com_ericsson_otp:driver_stop", Res),
@@ -213,6 +215,7 @@ t_driver_control_ready_async(Config) ->
%% com_ericsson_otp:driver_ready_output
t_driver_ready_input_output(Config) ->
ok = lttng_start_event("com_ericsson_otp:driver_ready_*", Config),
+ timer:sleep(500),
Me = self(),
Pid = spawn_link(fun() -> tcp_server(Me, active) end),
receive {Pid, accept} -> ok end,
@@ -225,6 +228,7 @@ t_driver_ready_input_output(Config) ->
ok = gen_tcp:close(Sock),
receive {Pid, done} -> ok end,
+ timer:sleep(500),
Res = lttng_stop_and_view(Config),
ok = check_tracepoint("com_ericsson_otp:driver_ready_input", Res),
ok = check_tracepoint("com_ericsson_otp:driver_ready_output", Res),