aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErland Schönbeck <erland@erlang.org>2015-03-09 14:26:15 +0100
committerErland Schönbeck <erland@erlang.org>2015-03-09 14:26:15 +0100
commit601ba7763892ddf81e4331962210771bdad04c82 (patch)
tree6f9f5071e0c90db4890853b6f94735d0852bb7af /erts
parent07abc92d5c763cee81bf69695e35a658ddc961dc (diff)
parentaa8f4f23ee08281f06f11b80bbdb27bf1f279521 (diff)
downloadotp-601ba7763892ddf81e4331962210771bdad04c82.tar.gz
otp-601ba7763892ddf81e4331962210771bdad04c82.tar.bz2
otp-601ba7763892ddf81e4331962210771bdad04c82.zip
Merge branch 'erland/ssh/time/OTP-12444' into maint
* erland/ssh/time/OTP-12444: Update misleading comment in ssh_basic_SUITE Update new time API and be back-compatible in ssh Use new time API and be back-compatible in ssh otp_SUITE: Ignore undefined functions in ssh
Diffstat (limited to 'erts')
-rw-r--r--erts/test/otp_SUITE.erl12
1 files changed, 10 insertions, 2 deletions
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index 171f722357..385353f046 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -95,7 +95,8 @@ undefined_functions(Config) when is_list(Config) ->
Undef5 = dialyzer_filter(Undef4),
Undef6 = wx_filter(Undef5),
Undef7 = gs_filter(Undef6),
- Undef = diameter_filter(Undef7),
+ Undef8 = diameter_filter(Undef7),
+ Undef = ssh_filter(Undef8),
case Undef of
[] -> ok;
@@ -219,7 +220,7 @@ gs_filter(Undef) ->
end.
diameter_filter(Undef) ->
- %% Filter away function calls that are catched.
+ %% Filter away function calls that are catched for OTP 18 time API
filter(fun({{diameter_lib,_,_},{erlang,convert_time_resolution,3}}) ->
false;
({{diameter_lib,_,_},{erlang,monotonic_time,0}}) ->
@@ -233,6 +234,13 @@ 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"),