aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-09-19 15:01:52 +0200
committerHenrik Nord <[email protected]>2012-09-19 15:01:52 +0200
commit1723cf86e1aaa9c0afadbaf7b8b3075d9eb8c674 (patch)
tree90e1a72e7fbde208e6a96eb802951838ab0f2b9f /erts
parentc24f87e19cc01437c3c7b84e9c3fbeceb8c3b736 (diff)
parente15330373750c0760305dc9ec2c9aef870eb53ba (diff)
downloadotp-1723cf86e1aaa9c0afadbaf7b8b3075d9eb8c674.tar.gz
otp-1723cf86e1aaa9c0afadbaf7b8b3075d9eb8c674.tar.bz2
otp-1723cf86e1aaa9c0afadbaf7b8b3075d9eb8c674.zip
Merge branch 'henrik/undef-fix/OTP-10428'
* henrik/undef-fix/OTP-10428: ignore calls to gs* modules if it is not built
Diffstat (limited to 'erts')
-rw-r--r--erts/test/otp_SUITE.erl21
1 files changed, 16 insertions, 5 deletions
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index 5f28f22606..b7ceb0a3fd 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -84,13 +84,14 @@ undefined_functions(Config) when is_list(Config) ->
"ExcludedFrom = ~p:_/_,"
"Undef - Undef | ExcludedFrom",
[UndefS,ExcludeFrom]),
- ?line {ok,Undef0} = xref:q(Server, lists:flatten(Q)),
- ?line Undef1 = hipe_filter(Undef0),
- ?line Undef2 = ssl_crypto_filter(Undef1),
- ?line Undef3 = edoc_filter(Undef2),
+ {ok,Undef0} = xref:q(Server, lists:flatten(Q)),
+ Undef1 = hipe_filter(Undef0),
+ Undef2 = ssl_crypto_filter(Undef1),
+ Undef3 = edoc_filter(Undef2),
Undef4 = eunit_filter(Undef3),
Undef5 = dialyzer_filter(Undef4),
- Undef = wx_filter(Undef5),
+ Undef6 = wx_filter(Undef5),
+ Undef = gs_filter(Undef6),
case Undef of
[] -> ok;
@@ -202,6 +203,16 @@ wx_filter(Undef) ->
_ -> Undef
end.
+gs_filter(Undef) ->
+ case code:lib_dir(gs) of
+ {error,bad_name} ->
+ filter(fun({_,{gs,_,_}}) -> false;
+ ({_,{gse,_,_}}) -> false;
+ ({_,{tool_utils,_,_}}) -> false;
+ (_) -> true
+ end, Undef);
+ _ -> Undef
+ end.
deprecated_not_in_obsolete(Config) when is_list(Config) ->
?line Server = ?config(xref_server, Config),