aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2017-11-16 22:51:57 +0100
committerLoïc Hoguin <[email protected]>2017-11-16 22:51:57 +0100
commit48631aea66c06b5706fb56d3e24f284347ac469d (patch)
treea7e291181cc975299c1fc3da00ff72c05d78fe41
parentc9f004c62c1edfad5ac7b6f68ba33b574f330921 (diff)
downloadranch-48631aea66c06b5706fb56d3e24f284347ac469d.tar.gz
ranch-48631aea66c06b5706fb56d3e24f284347ac469d.tar.bz2
ranch-48631aea66c06b5706fb56d3e24f284347ac469d.zip
Disable tests that use tracing when +native is used
-rw-r--r--ebin/ranch.app2
-rw-r--r--test/acceptor_SUITE.erl40
-rw-r--r--test/sendfile_SUITE.erl6
3 files changed, 42 insertions, 6 deletions
diff --git a/ebin/ranch.app b/ebin/ranch.app
index d41d60a..360dfa7 100644
--- a/ebin/ranch.app
+++ b/ebin/ranch.app
@@ -1,4 +1,4 @@
-{application, ranch, [
+{application, 'ranch', [
{description, "Socket acceptor pool for TCP protocols."},
{vsn, "1.4.0"},
{modules, ['ranch','ranch_acceptor','ranch_acceptors_sup','ranch_app','ranch_conns_sup','ranch_listener_sup','ranch_protocol','ranch_server','ranch_ssl','ranch_sup','ranch_tcp','ranch_transport']},
diff --git a/test/acceptor_SUITE.erl b/test/acceptor_SUITE.erl
index 640195a..2ef845d 100644
--- a/test/acceptor_SUITE.erl
+++ b/test/acceptor_SUITE.erl
@@ -434,7 +434,13 @@ tcp_set_max_connections(_) ->
20 = ranch:get_max_connections(Name),
ok = ranch:stop_listener(Name).
-tcp_set_max_connections_clean(_) ->
+tcp_set_max_connections_clean(Config) ->
+ case code:is_module_native(?MODULE) of
+ true -> doc("This test uses tracing and is not compatible with native code.");
+ false -> do_tcp_set_max_connections_clean(Config)
+ end.
+
+do_tcp_set_max_connections_clean(_) ->
doc("Ensure that setting max_connections does not crash any process."),
Name = name(),
{ok, ListSupPid} = ranch:start_listener(Name, ranch_tcp,
@@ -532,7 +538,13 @@ connection_type_supervisor_separate_from_connection(_) ->
{'EXIT', _} = begin catch ranch:get_port(Name) end,
ok.
-supervisor_clean_child_restart(_) ->
+supervisor_clean_child_restart(Config) ->
+ case code:is_module_native(?MODULE) of
+ true -> doc("This test uses tracing and is not compatible with native code.");
+ false -> do_supervisor_clean_child_restart(Config)
+ end.
+
+do_supervisor_clean_child_restart(_) ->
doc("Verify that only the relevant parts of the supervision tree restarted "
"when the listening socket is closed."),
Name = name(),
@@ -591,7 +603,13 @@ supervisor_clean_conns_sup_restart(_) ->
end,
ok = ranch:stop_listener(Name).
-supervisor_clean_restart(_) ->
+supervisor_clean_restart(Config) ->
+ case code:is_module_native(?MODULE) of
+ true -> doc("This test uses tracing and is not compatible with native code.");
+ false -> do_supervisor_clean_restart(Config)
+ end.
+
+do_supervisor_clean_restart(_) ->
doc("Verify that killing ranch_conns_sup does not crash everything "
"and that it restarts properly."),
Name = name(),
@@ -624,7 +642,13 @@ supervisor_clean_restart(_) ->
ok = clean_traces(),
ok = ranch:stop_listener(Name).
-supervisor_conns_alive(_) ->
+supervisor_conns_alive(Config) ->
+ case code:is_module_native(?MODULE) of
+ true -> doc("This test uses tracing and is not compatible with native code.");
+ false -> do_supervisor_conns_alive(Config)
+ end.
+
+do_supervisor_conns_alive(_) ->
doc("Ensure that active connections stay open when the listening socket gets closed."),
Name = name(),
_ = erlang:trace(new, true, [call]),
@@ -665,7 +689,13 @@ supervisor_protocol_start_link_crash(_) ->
ConnsSup = ranch_server:get_connections_sup(Name),
ok = ranch:stop_listener(Name).
-supervisor_server_recover_state(_) ->
+supervisor_server_recover_state(Config) ->
+ case code:is_module_native(?MODULE) of
+ true -> doc("This test uses tracing and is not compatible with native code.");
+ false -> do_supervisor_server_recover_state(Config)
+ end.
+
+do_supervisor_server_recover_state(_) ->
doc("Ensure that when ranch_server crashes and restarts, it recovers "
"its state and continues monitoring the same processes."),
Name = name(),
diff --git a/test/sendfile_SUITE.erl b/test/sendfile_SUITE.erl
index 14bc47d..e2c9dc0 100644
--- a/test/sendfile_SUITE.erl
+++ b/test/sendfile_SUITE.erl
@@ -227,6 +227,12 @@ rawfile_range_small(Config) ->
ok = Transport:close(Server).
ssl_chunk_size(Config) ->
+ case code:is_module_native(?MODULE) of
+ true -> doc("This test uses tracing and is not compatible with native code.");
+ false -> do_ssl_chunk_size(Config)
+ end.
+
+do_ssl_chunk_size(Config) ->
doc("Use sendfile with SSL. Ensure the sendfile fallback respects the chunk size."),
Transport = config(transport, Config),
Filename = config(filename, Config),