mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-22 16:20:52 +01:00
Fix includes in eunit compilation flags
This commit is contained in:
parent
daab95e3b5
commit
d00a634025
@ -113,7 +113,8 @@
|
|||||||
{if_var_false, elixir, "(\"Elixir.*\":_/_)"},
|
{if_var_false, elixir, "(\"Elixir.*\":_/_)"},
|
||||||
{if_var_false, redis, "(\"eredis\":_/_)"}]}.
|
{if_var_false, redis, "(\"eredis\":_/_)"}]}.
|
||||||
|
|
||||||
{eunit_compile_opts, [{i, "tools"}]}.
|
{eunit_compile_opts, [{i, "tools"}, {i, "include"},
|
||||||
|
{i, "deps/fast_xml/include"}]}.
|
||||||
|
|
||||||
{if_version_above, "17", {cover_enabled, true}}.
|
{if_version_above, "17", {cover_enabled, true}}.
|
||||||
{cover_export_enabled, true}.
|
{cover_export_enabled, true}.
|
||||||
|
@ -121,10 +121,16 @@ TestConfig = case file:read_file_info(TestConfigFile) of
|
|||||||
""
|
""
|
||||||
end,
|
end,
|
||||||
|
|
||||||
Conf2 = [{ct_extra_params, "-ct_hooks cth_surefire "
|
CtIncludes = case lists:keyfind(eunit_compile_opts, 1, Conf1) of
|
||||||
++ TestConfig
|
false ->
|
||||||
++ "-include "
|
[];
|
||||||
++ filename:join([Cwd, "tools"])} | Conf1],
|
{_, EunitCompOpts} ->
|
||||||
|
[[" -include ", filename:join([Cwd, IncPath])]
|
||||||
|
|| {i, IncPath} <- EunitCompOpts]
|
||||||
|
end,
|
||||||
|
|
||||||
|
Conf2 = [{ct_extra_params, lists:flatten(["-ct_hooks cth_surefire ", TestConfig,
|
||||||
|
CtIncludes])} | Conf1],
|
||||||
|
|
||||||
Conf3 = case lists:keytake(xref_exclusions, 1, Conf2) of
|
Conf3 = case lists:keytake(xref_exclusions, 1, Conf2) of
|
||||||
{value, {_, Items2}, Rest2} ->
|
{value, {_, Items2}, Rest2} ->
|
||||||
|
Loading…
Reference in New Issue
Block a user