Fix includes in eunit compilation flags

2 files changed, 14 insertions, 7 deletions

diff --git a/rebar.config b/rebar.config
index 966b746c1..f9af6a568 100644
--- a/rebar.config
+++ b/rebar.config
@@ -113,7 +113,8 @@
                    {if_var_false, elixir, "(\"Elixir.*\":_/_)"},
                    {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}}.
 {cover_export_enabled, true}.
diff --git a/rebar.config.script b/rebar.config.script
index ccafba7ec..2a924d26c 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -119,12 +119,18 @@ TestConfig = case file:read_file_info(TestConfigFile) of
                      "-userconfig ct_config_plain " ++ TestConfigFile ++ " ";
                  _ ->
                      ""
-             end,
-
-Conf2 = [{ct_extra_params, "-ct_hooks cth_surefire "
-         ++ TestConfig
-         ++ "-include "
-         ++ filename:join([Cwd, "tools"])} | Conf1],
+	     end,
+
+CtIncludes = case lists:keyfind(eunit_compile_opts, 1, Conf1) of
+		 false ->
+		     [];
+		 {_, 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
             {value, {_, Items2}, Rest2} ->