Merge branch 'maint'

* maint:
  ts: Recognize Windows 7
  otp_SUITE: Ignore calls to dialyzer if the entire application is missing
  otp_SUITE: Remove broken filtering of megaco calls

2 files changed, 17 insertions, 30 deletions

diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index 644b54f0e1..277abb2554 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -88,8 +88,8 @@ undefined_functions(Config) when is_list(Config) ->
     ?line Undef1 = hipe_filter(Undef0),
     ?line Undef2 = ssl_crypto_filter(Undef1),
     ?line Undef3 = edoc_filter(Undef2),
-    ?line Undef = eunit_filter(Undef3),
-    ?line Undef = megaco_filter(Undef),
+    Undef4 = eunit_filter(Undef3),
+    Undef = dialyzer_filter(Undef4),
 
     case Undef of
 	[] -> ok;
@@ -173,34 +173,20 @@ eunit_filter(Undef) ->
 	      (_) -> true
 	   end, Undef).
 
-megaco_filter(Undef) ->
-    %% Intentional calls to undefined functions.
-    filter(fun({{megaco_compact_text_encoder,encode_action_reply,3},
-		{megaco_compact_text_encoder_v3,encode_action_reply,2}}) -> false;
-	      ({{megaco_compact_text_encoder,encode_action_request,3},
-		{megaco_compact_text_encoder_v3,encode_action_request,2}}) -> false;
-	      ({{megaco_compact_text_encoder,encode_action_requests,3},
-		{megaco_compact_text_encoder_v3,encode_action_requests,2}}) -> false;
-	      ({{megaco_compact_text_encoder,encode_command_request,3},
-		{megaco_compact_text_encoder_v3,encode_command_request,2}}) -> false;
-	      ({{megaco_compact_text_encoder,encode_message,3},
-		{megaco_compact_text_encoder_v3,encode_message,2}}) -> false;
-	      ({{megaco_compact_text_encoder,encode_transaction,3},
-		{megaco_compact_text_encoder_v3,encode_transaction,2}}) -> false;
-	      ({{megaco_pretty_text_encoder,encode_action_reply,3},
-		{megaco_pretty_text_encoder_v3,encode_action_reply,2}}) -> false;
-	      ({{megaco_pretty_text_encoder,encode_action_request,3},
-		{megaco_pretty_text_encoder_v3,encode_action_request,2}}) -> false;
-	      ({{megaco_pretty_text_encoder,encode_action_requests,3},
-		{megaco_pretty_text_encoder_v3,encode_action_requests,2}}) -> false;
-	      ({{megaco_pretty_text_encoder,encode_command_request,3},
-		{megaco_pretty_text_encoder_v3,encode_command_request,2}}) -> false;
-	      ({{megaco_pretty_text_encoder,encode_message,3},
-		{megaco_pretty_text_encoder_v3,encode_message,2}}) -> false;
-	      ({{megaco_pretty_text_encoder,encode_transaction,3},
-		{megaco_pretty_text_encoder_v3,encode_transaction,2}}) -> false;
-	      (_) -> true
-	   end, Undef).
+dialyzer_filter(Undef) ->
+    case code:lib_dir(dialyzer) of
+	{error,bad_name} ->
+	    filter(fun({_,{dialyzer_callgraph,_,_}}) -> false;
+		      ({_,{dialyzer_codeserver,_,_}}) -> false;
+		      ({_,{dialyzer_contracts,_,_}}) -> false;
+		      ({_,{dialyzer_cl_parse,_,_}}) -> false;
+		      ({_,{dialyzer_plt,_,_}}) -> false;
+		      ({_,{dialyzer_succ_typings,_,_}}) -> false;
+		      ({_,{dialyzer_utils,_,_}}) -> false;
+		      (_) -> true
+		   end, Undef);
+	_ -> Undef
+    end.
 
 deprecated_not_in_obsolete(Config) when is_list(Config) ->
     ?line Server = ?config(xref_server, Config),
diff --git a/lib/test_server/src/ts_autoconf_win32.erl b/lib/test_server/src/ts_autoconf_win32.erl
index 9103542fd2..258040b39e 100644
--- a/lib/test_server/src/ts_autoconf_win32.erl
+++ b/lib/test_server/src/ts_autoconf_win32.erl
@@ -67,6 +67,7 @@ system_type(Vars) ->
 		     {5,1,_} -> "Windows XP";
 		     {5,2,_} -> "Windows 2003";
 		     {6,0,_} -> "Windows Vista";
+		     {6,1,_} -> "Windows 7";
 		     {_,_,_} -> "Windows NCC-1701-D"
 		 end;
 	     {win32, windows} ->