diff options
| author | Jordan Wilberding <[email protected]> | 2014-11-20 08:35:20 -0800 |
|---|---|---|
| committer | Jordan Wilberding <[email protected]> | 2014-11-20 08:35:20 -0800 |
| commit | fb9fd6019235186a0a22f4c0b6d6ace21d6c36a0 (patch) | |
| tree | 4449b097da5846f558fbdf4517dac10a54723f7b /test | |
| parent | 2db3228ad191527e582a6eec2265195ba0446a8c (diff) | |
| parent | 1a47eb9b920b38bf4607c4691d873774b74cdcd9 (diff) | |
| download | relx-fb9fd6019235186a0a22f4c0b6d6ace21d6c36a0.tar.gz relx-fb9fd6019235186a0a22f4c0b6d6ace21d6c36a0.tar.bz2 relx-fb9fd6019235186a0a22f4c0b6d6ace21d6c36a0.zip | |
Merge pull request #269 from tsloughter/relup_fix
add back _rel to app discovery, fix relup tests to notice
Diffstat (limited to 'test')
| -rw-r--r-- | test/rlx_release_SUITE.erl | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl index 112afc8..6ae4f24 100644 --- a/test/rlx_release_SUITE.erl +++ b/test/rlx_release_SUITE.erl @@ -737,9 +737,16 @@ make_relup_release(Config) -> OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), {ok, _} = relx:do(foo, "0.0.1", [], [LibDir1], 3, - OutputDir, ConfigFile), + OutputDir, ConfigFile), + {ok, _} = relx:do(foo, "0.0.2", [], [LibDir1], 3, - OutputDir, ConfigFile), + OutputDir, ConfigFile), + + %% Goal apps are removed to simulate a users dev environment where the apps + %% being used in an appup/relup are likely only under _rel/<release>/lib/ + ec_file:remove(filename:join(LibDir1, "goal_app_1-0.0.1"), [recursive]), + ec_file:remove(filename:join(LibDir1, "goal_app_1-0.0.2"), [recursive]), + {ok, State} = relx:do([{relname, foo}, {relvsn, "0.0.3"}, {goals, []}, @@ -821,13 +828,13 @@ make_relup_release2(Config) -> {ok, _} = relx:do(foo, "0.0.2", [], [LibDir1], 3, OutputDir, ConfigFile), {ok, State} = relx:do([{relname, foo}, - {relvsn, "0.0.3"}, - {upfrom, "0.0.1"}, - {goals, []}, - {lib_dirs, [LibDir1]}, - {log_level, 3}, - {output_dir, OutputDir}, - {config, ConfigFile}], ["release", "relup"]), + {relvsn, "0.0.3"}, + {upfrom, "0.0.1"}, + {goals, []}, + {lib_dirs, [LibDir1]}, + {log_level, 3}, + {output_dir, OutputDir}, + {config, ConfigFile}], ["release", "relup"]), %% we should have one 'resolved' release and three discovered realized_releases. ?assertMatch([{foo, "0.0.1"}, |