Merge pull request #966 from talentdeficit/ct_root_suites

allow ct suites to be specified at root of project (or root of app)

2 files changed, 33 insertions, 3 deletions

diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl
index 05a1dc6..1136e08 100644
--- a/src/rebar_prv_common_test.erl
+++ b/src/rebar_prv_common_test.erl
@@ -340,7 +340,7 @@ test_dirs(State, Apps, Opts) ->
         {Suites, Dir} when is_integer(hd(Dir)) ->
             set_compile_dirs(State, Apps, join(Suites, Dir));
         {Suites, [Dir]} when is_integer(hd(Dir)) ->
-            set_compile_dirs(State, Apps, join(Suites, Dir));          
+            set_compile_dirs(State, Apps, join(Suites, Dir));
         {_Suites, _Dirs}    -> {error, "Only a single directory may be specified when specifying suites"}
     end.
 
@@ -375,6 +375,17 @@ find_suite_dirs(Suites) ->
 
 maybe_inject_test_dir(State, AppAcc, [App|Rest], Dir) ->
     case rebar_file_utils:path_from_ancestor(Dir, rebar_app_info:dir(App)) of
+        {ok, []}   ->
+            %% normal operation involves copying the entire directory a
+            %% suite exists in but if the suite is in the app root directory
+            %% the current compiler tries to compile all subdirs including priv
+            %% instead copy only files ending in `.erl' and directories
+            %% ending in `_SUITE_data' into the `_build/PROFILE/extras' dir
+            {ok, RelAppDir} = rebar_file_utils:path_from_ancestor(rebar_app_info:dir(App), rebar_state:dir(State)),
+            ExtrasDir = filename:join([rebar_dir:base_dir(State), "extras", RelAppDir]),
+            ok = copy_bare_suites(Dir, ExtrasDir),
+            Opts = inject_test_dir(rebar_state:opts(State), ExtrasDir),
+            {rebar_state:opts(State, Opts), AppAcc};
         {ok, Path} ->
             Opts = inject_test_dir(rebar_app_info:opts(App), Path),
             {State, AppAcc ++ [rebar_app_info:opts(App, Opts)] ++ Rest};
@@ -384,8 +395,15 @@ maybe_inject_test_dir(State, AppAcc, [App|Rest], Dir) ->
 maybe_inject_test_dir(State, AppAcc, [], Dir) ->
     case rebar_file_utils:path_from_ancestor(Dir, rebar_state:dir(State)) of
         {ok, []}   ->
-            ?WARN("Can't have suites in root of project dir, dropping from tests", []),
-            {State, AppAcc};
+            %% normal operation involves copying the entire directory a
+            %% suite exists in but if the suite is in the root directory
+            %% that results in a loop as we copy `_build' into itself
+            %% instead copy only files ending in `.erl' and directories
+            %% ending in `_SUITE_data' in the `_build/PROFILE/extras' dir
+            ExtrasDir = filename:join([rebar_dir:base_dir(State), "extras"]),
+            ok = copy_bare_suites(Dir, ExtrasDir),
+            Opts = inject_test_dir(rebar_state:opts(State), ExtrasDir),
+            {rebar_state:opts(State, Opts), AppAcc};
         {ok, Path} ->
             Opts = inject_test_dir(rebar_state:opts(State), Path),
             {rebar_state:opts(State, Opts), AppAcc};
@@ -393,6 +411,14 @@ maybe_inject_test_dir(State, AppAcc, [], Dir) ->
             {State, AppAcc}
     end.
 
+copy_bare_suites(From, To) ->
+    filelib:ensure_dir(filename:join([To, "dummy.txt"])),
+    SrcFiles = rebar_utils:find_files(From, ".*\\.[e|h]rl\$", false),
+    DataDirs = lists:filter(fun filelib:is_dir/1,
+                            filelib:wildcard(filename:join([From, "*_SUITE_data"]))),
+    ok = rebar_file_utils:cp_r(SrcFiles, To),
+    rebar_file_utils:cp_r(DataDirs, To).
+
 inject_test_dir(Opts, Dir) ->
     %% append specified test targets to app defined `extra_src_dirs`
     ExtraSrcDirs = rebar_opts:get(Opts, extra_src_dirs, []),
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index 2996aee..d57b82b 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -217,6 +217,10 @@ copy(OldAppDir, AppDir, Dir) ->
 
 %% TODO: use ec_file:copy/2 to do this, it preserves timestamps and
 %% may prevent recompilation of files in extra dirs
+copy(Source, Source) ->
+    %% allow users to specify a directory in _build as a directory
+    %% containing additional source/tests
+    ok;
 copy(Source, Target) ->
     %% important to do this so no files are copied onto themselves
     %% which truncates them to zero length on some platforms