diff options
| author | Erland Schönbeck <[email protected]> | 2015-03-23 12:12:38 +0100 |
|---|---|---|
| committer | Erland Schönbeck <[email protected]> | 2015-03-23 12:12:38 +0100 |
| commit | 7a4967882b44e9048949bd8dc6cb6e953ea0c1c9 (patch) | |
| tree | 54d3da0fb406b7f29538d76df0d17ff47f5a7ccc /erts | |
| parent | 90f97f3e17acb63bfae2e07646cfaf098ed3dbdd (diff) | |
| parent | 68f600f7466abca20ab5b2f81ab3c433a2b87064 (diff) | |
| download | otp-7a4967882b44e9048949bd8dc6cb6e953ea0c1c9.tar.gz otp-7a4967882b44e9048949bd8dc6cb6e953ea0c1c9.tar.bz2 otp-7a4967882b44e9048949bd8dc6cb6e953ea0c1c9.zip | |
Merge branch 'erland/revert_time/OTP-12444' into maint
* erland/revert_time/OTP-12444:
Revert "Use new time API and be back-compatible in ssh"
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/test/otp_SUITE.erl | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl index 385353f046..171f722357 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"), |