diff options
| author | Erland Schönbeck <[email protected]> | 2015-03-16 15:17:26 +0100 |
|---|---|---|
| committer | Erland Schönbeck <[email protected]> | 2015-03-16 15:28:47 +0100 |
| commit | 68f600f7466abca20ab5b2f81ab3c433a2b87064 (patch) | |
| tree | 35ada88768be8cba83e7761fd21a73d360a853eb /erts | |
| parent | 5fde23474656c1934250e8b8a9c7399dc00d5bdf (diff) | |
| download | otp-68f600f7466abca20ab5b2f81ab3c433a2b87064.tar.gz otp-68f600f7466abca20ab5b2f81ab3c433a2b87064.tar.bz2 otp-68f600f7466abca20ab5b2f81ab3c433a2b87064.zip | |
Revert "Use new time API and be back-compatible in ssh"
This reverts commit af972aaf14a5f53510e692f48f672f7e6805ee6d.
Conflicts:
lib/ssh/test/ssh_basic_SUITE.erl
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"), |