Merge branch 'maint'

* maint:
  Ignore calls to wx* modules if it is undefined
  Fix erl_interface testcases
  Update gccifier to respect -link option
  Extand timetrap for escript tests
  Fix compilation issues on windows and Ubuntu 12.04
  Ignore common_test bootstrap

1 files changed, 15 insertions, 1 deletions

diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index 277abb2554..332733e075 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -89,7 +89,8 @@ undefined_functions(Config) when is_list(Config) ->
     ?line Undef2 = ssl_crypto_filter(Undef1),
     ?line Undef3 = edoc_filter(Undef2),
     Undef4 = eunit_filter(Undef3),
-    Undef = dialyzer_filter(Undef4),
+    Undef5 = dialyzer_filter(Undef4),
+    Undef = wx_filter(Undef5),
 
     case Undef of
 	[] -> ok;
@@ -188,6 +189,19 @@ dialyzer_filter(Undef) ->
 	_ -> Undef
     end.
 
+wx_filter(Undef) ->
+    case code:lib_dir(wx) of
+	{error,bad_name} ->
+	    filter(fun({_,{MaybeWxModule,_,_}}) ->
+			   case atom_to_list(MaybeWxModule) of
+			       "wx"++_ -> false;
+			       _ -> true
+			   end
+		   end, Undef);
+	_ -> Undef
+    end.
+				   
+
 deprecated_not_in_obsolete(Config) when is_list(Config) ->
     ?line Server = ?config(xref_server, Config),
     ?line {ok,DeprecatedFunctions} = xref:q(Server, "DF"),