diff options
| author | Tristan Sloughter <t@crashfast.com> | 2015-02-25 09:49:45 -0600 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2015-02-28 09:56:19 -0600 |
| commit | d4c2332aabb4337b49bb3ef03793408c58afd5d4 (patch) | |
| tree | 48f1e012bc761e3fa8d257511e4da3c073fff65a /test | |
| parent | 71d70fca1f1182b8f4919e2b3f5a7ff277700271 (diff) | |
make base_dir for a run include the profiles in path, link to shared deps
Diffstat (limited to 'test')
| -rw-r--r-- | test/rebar_test_utils.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/rebar_test_utils.erl b/test/rebar_test_utils.erl index a036619..8dfb7ad 100644 --- a/test/rebar_test_utils.erl +++ b/test/rebar_test_utils.erl @@ -142,7 +142,7 @@ top_level_deps([{{Name, Vsn, Ref}, _} | Deps]) -> %%% Helpers %%% %%%%%%%%%%%%%%% check_results(AppDir, Expected) -> - BuildDir = filename:join([AppDir, "_build", "lib"]), + BuildDirs = filelib:wildcard(filename:join([AppDir, "_build", "*", "lib"])), CheckoutsDir = filename:join([AppDir, "_checkouts"]), LockFile = filename:join([AppDir, "rebar.lock"]), Locks = lists:flatten(rebar_config:consult_file(LockFile)), @@ -152,7 +152,7 @@ check_results(AppDir, Expected) -> AppsNames = [{ec_cnv:to_list(rebar_app_info:name(App)), App} || App <- Apps], InvalidAppsNames = [{ec_cnv:to_list(rebar_app_info:name(App)), App} || App <- InvalidApps], ValidAppsNames = [{ec_cnv:to_list(rebar_app_info:name(App)), App} || App <- ValidApps], - Deps = rebar_app_discover:find_apps([BuildDir], all), + Deps = rebar_app_discover:find_apps(BuildDirs, all), DepsNames = [{ec_cnv:to_list(rebar_app_info:name(App)), App} || App <- Deps], Checkouts = rebar_app_discover:find_apps([CheckoutsDir], all), CheckoutsNames = [{ec_cnv:to_list(rebar_app_info:name(App)), App} || App <- Checkouts], @@ -217,7 +217,7 @@ check_results(AppDir, Expected) -> {ok, Cwd} = file:get_cwd(), try file:set_cwd(AppDir), - ReleaseDir = filename:join([AppDir, "_build", "rel"]), + [ReleaseDir] = filelib:wildcard(filename:join([AppDir, "_build", "*", "rel"])), RelxState = rlx_state:new("", [], []), RelxState1 = rlx_state:base_output_dir(RelxState, ReleaseDir), {ok, RelxState2} = rlx_prv_app_discover:do(RelxState1), |