From 639906bdb531160d7d6a0322acfd7672b48a5387 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Sun, 20 Dec 2015 18:47:05 -0800 Subject: put `extra' ct test suites in `extras/apps/APPNAME' rather than `extras' this allows repeated test suite names across apps without conflicts --- src/rebar_prv_common_test.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl index 2a76ebb..1136e08 100644 --- a/src/rebar_prv_common_test.erl +++ b/src/rebar_prv_common_test.erl @@ -381,7 +381,8 @@ maybe_inject_test_dir(State, AppAcc, [App|Rest], Dir) -> %% 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 - ExtrasDir = filename:join([rebar_dir:base_dir(State), "extras"]), + {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}; -- cgit v1.1