Merge branch 'maint'

Conflicts:
	erts/test/otp_SUITE.erl

1 files changed, 26 insertions, 2 deletions

diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index 229d10ccee..385353f046 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2015. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -94,7 +94,9 @@ undefined_functions(Config) when is_list(Config) ->
     Undef4 = eunit_filter(Undef3),
     Undef5 = dialyzer_filter(Undef4),
     Undef6 = wx_filter(Undef5),
-    Undef  = gs_filter(Undef6),
+    Undef7 = gs_filter(Undef6),
+    Undef8 = diameter_filter(Undef7),
+    Undef = ssh_filter(Undef8),
 
     case Undef of
 	[] -> ok;
@@ -217,6 +219,28 @@ gs_filter(Undef) ->
 	_ -> Undef
     end.
 
+diameter_filter(Undef) ->
+    %% 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}}) ->
+                   false;
+              ({{diameter_lib,_,_},{erlang,time_resolution,0}}) ->
+                   false;
+              ({{diameter_lib,_,_},{erlang,unique_integer,0}}) ->
+                   false;
+              ({{diameter_lib,_,_},{erlang,time_offset,0}}) ->
+                   false;
+	      (_) -> 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"),