aboutsummaryrefslogtreecommitdiffstats
path: root/erts/test/otp_SUITE.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-06-01 10:53:19 +0200
committerLukas Larsson <[email protected]>2012-06-01 10:53:19 +0200
commit4c70878ddf1ef065e7e83395c96a7d9e9c4e27b0 (patch)
treeaa4c8c4fb80ad16b3185d94dc0a972b17fe1082d /erts/test/otp_SUITE.erl
parent523516d049cd246fd68f5ec69c56fd4d5b8172f5 (diff)
parentb82c337dfce2d5bc1e435ebaa6060cb982bc5ad6 (diff)
downloadotp-4c70878ddf1ef065e7e83395c96a7d9e9c4e27b0.tar.gz
otp-4c70878ddf1ef065e7e83395c96a7d9e9c4e27b0.tar.bz2
otp-4c70878ddf1ef065e7e83395c96a7d9e9c4e27b0.zip
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
Diffstat (limited to 'erts/test/otp_SUITE.erl')
-rw-r--r--erts/test/otp_SUITE.erl16
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"),