aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErland Schönbeck <[email protected]>2015-03-23 13:38:24 +0100
committerErland Schönbeck <[email protected]>2015-03-23 13:38:24 +0100
commitd9eb16007cab3238ea2f6667cdc7731b0aa50edc (patch)
tree31faf771fe0b82b707ccc87e56e880adc5594757 /erts
parent84dca51e002b99f0348b715f2f4d484e492bb518 (diff)
parent7a4967882b44e9048949bd8dc6cb6e953ea0c1c9 (diff)
downloadotp-d9eb16007cab3238ea2f6667cdc7731b0aa50edc.tar.gz
otp-d9eb16007cab3238ea2f6667cdc7731b0aa50edc.tar.bz2
otp-d9eb16007cab3238ea2f6667cdc7731b0aa50edc.zip
Merge branch 'maint'
Conflicts: lib/ssh/test/ssh_basic_SUITE.erl
Diffstat (limited to 'erts')
-rw-r--r--erts/test/otp_SUITE.erl12
1 files changed, 2 insertions, 10 deletions
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index ba71100081..1e42b5193c 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -95,8 +95,7 @@ undefined_functions(Config) when is_list(Config) ->
Undef5 = dialyzer_filter(Undef4),
Undef6 = wx_filter(Undef5),
Undef7 = gs_filter(Undef6),
- Undef8 = diameter_filter(Undef7),
- Undef = ssh_filter(Undef8),
+ Undef = diameter_filter(Undef7),
case Undef of
[] -> ok;
@@ -220,7 +219,7 @@ gs_filter(Undef) ->
end.
diameter_filter(Undef) ->
- %% Filter away function calls that are catched for OTP 18 time API
+ %% Filter away function calls that are catched.
filter(fun({{diameter_lib,_,_},{erlang,convert_time_resolution,3}}) ->
false;
({{diameter_lib,_,_},{erlang,monotonic_time,0}}) ->
@@ -234,13 +233,6 @@ diameter_filter(Undef) ->
(_) -> true
end, Undef).
-ssh_filter(Undef) ->
- %% Filter away function calls that are catched for OTP 18 time API
- filter(fun({{ssh_info,_,_},{erlang,timestamp,0}}) ->
- false;
- (_) -> true
- end, Undef).
-
deprecated_not_in_obsolete(Config) when is_list(Config) ->
?line Server = ?config(xref_server, Config),
?line {ok,DeprecatedFunctions} = xref:q(Server, "DF"),