diff options
| author | Erlang/OTP <[email protected]> | 2016-06-29 17:42:51 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-06-29 17:42:51 +0200 |
| commit | 1d4bbde0a9c85849025c5f03bcc76ed014ced395 (patch) | |
| tree | 005d5c457bbb00847e7c3958ed3134c7414d0577 | |
| parent | 0eb8392e9cdc01393a1a0efd7648d9602ae7e627 (diff) | |
| parent | 44fb5e8c080a682cd47b791ae641c196b1c0ec74 (diff) | |
| download | otp-1d4bbde0a9c85849025c5f03bcc76ed014ced395.tar.gz otp-1d4bbde0a9c85849025c5f03bcc76ed014ced395.tar.bz2 otp-1d4bbde0a9c85849025c5f03bcc76ed014ced395.zip | |
Merge branch 'hasse/tools/fix_xref/ERL-173/OTP-13708' into maint-19
* hasse/tools/fix_xref/ERL-173/OTP-13708:
tools: Fix a bug adding multiple modules to an Xref server
| -rw-r--r-- | lib/tools/src/xref_base.erl | 4 | ||||
| -rw-r--r-- | lib/tools/test/xref_SUITE.erl | 17 |
2 files changed, 18 insertions, 3 deletions
diff --git a/lib/tools/src/xref_base.erl b/lib/tools/src/xref_base.erl index bb9815f9b0..f298a1ce81 100644 --- a/lib/tools/src/xref_base.erl +++ b/lib/tools/src/xref_base.erl @@ -746,7 +746,7 @@ read_a_module({Dir, BaseName}, AppName, Builtins, Verbose, Warnings, Mode) -> message(Warnings, no_debug_info, [File]), no; {ok, M, Data, UnresCalls0} -> - message(Verbose, done, [File]), + message(Verbose, done_file, [File]), %% Remove duplicates. Identical unresolved calls on the %% same line are counted as _one_ unresolved call. UnresCalls = usort(UnresCalls0), @@ -1842,6 +1842,8 @@ message(true, What, Arg) -> set_up -> io:format("Setting up...", Arg); done -> + io:format("done~n", Arg); + done_file -> io:format("done reading ~ts~n", Arg); error -> io:format("error~n", Arg); diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl index ce30fb711a..01dbac6ecb 100644 --- a/lib/tools/test/xref_SUITE.erl +++ b/lib/tools/test/xref_SUITE.erl @@ -50,7 +50,7 @@ -export([analyze/1, basic/1, md/1, q/1, variables/1, unused_locals/1]). --export([format_error/1, otp_7423/1, otp_7831/1, otp_10192/1]). +-export([format_error/1, otp_7423/1, otp_7831/1, otp_10192/1, otp_13708/1]). -import(lists, [append/2, flatten/1, keysearch/3, member/2, sort/1, usort/1]). @@ -82,7 +82,7 @@ groups() -> fun_mfa_r14, fun_mfa_vars, qlc]}, {analyses, [], [analyze, basic, md, q, variables, unused_locals]}, - {misc, [], [format_error, otp_7423, otp_7831, otp_10192]}]. + {misc, [], [format_error, otp_7423, otp_7831, otp_10192, otp_13708]}]. init_per_suite(Conf) when is_list(Conf) -> @@ -2393,6 +2393,19 @@ otp_10192(Conf) when is_list(Conf) -> xref:stop(s), ok. +%% OTP-10192. Allow filenames with character codes greater than 126. +otp_13708(Conf) when is_list(Conf) -> + {ok, _} = start(s), + ok = xref:set_default(s, [{verbose, true}]), + {ok, []} = xref:q(s,"E"), + xref:stop(s), + + CopyDir = ?copydir, + Dir = fname(CopyDir,"lib_test"), + {ok, _} = start(s), + ok = xref:set_library_path(s, [Dir], [{verbose, true}]), + xref:stop(s). + %%% %%% Utilities %%% |