summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoralisdair sullivan <alisdair.sullivan@askuity.com>2015-12-20 18:47:05 -0800
committeralisdair sullivan <alisdair.sullivan@askuity.com>2015-12-20 19:07:26 -0800
commit639906bdb531160d7d6a0322acfd7672b48a5387 (patch)
tree65d60be1151f1ae5be07be61b016f461fad3a010 /src
parent9acd23f72799c6130b9f7a2c226346dcd10ac2c8 (diff)
put `extra' ct test suites in `extras/apps/APPNAME' rather than `extras'
this allows repeated test suite names across apps without conflicts
Diffstat (limited to 'src')
-rw-r--r--src/rebar_prv_common_test.erl3
1 files changed, 2 insertions, 1 deletions
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};