From d903c6e52fd7a28e5cee8d0459f0e2ee795f2c93 Mon Sep 17 00:00:00 2001 From: AlexSedov Date: Tue, 31 Jul 2018 18:31:25 +0300 Subject: Make {goals, ...} option add goals to release depsolver. Additionally, provides parsing for in-config goals, and better goal merging. Closes #571. This reverts commit 0ffe8cd1a2a4e039a48d1096fc250b3f6bd3dcd1. --- test/rlx_release_SUITE.erl | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) (limited to 'test/rlx_release_SUITE.erl') diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl index affc0ad..f0c10c3 100644 --- a/test/rlx_release_SUITE.erl +++ b/test/rlx_release_SUITE.erl @@ -40,6 +40,7 @@ make_implicit_config_release/1, overlay_release/1, make_goalless_release/1, + make_external_goal_release/1, make_depfree_release/1, make_invalid_config_release/1, make_relup_release/1, @@ -87,7 +88,7 @@ all() -> make_overridden_release, make_auto_skip_empty_app_release, make_skip_app_release, make_exclude_app_release, make_app_type_none_release, make_implicit_config_release, make_rerun_overridden_release, - overlay_release, make_goalless_release, make_depfree_release, + overlay_release, make_goalless_release, make_external_goal_release, make_depfree_release, make_invalid_config_release, make_relup_release, make_relup_release2, make_one_app_top_level_release, make_dev_mode_release, make_dev_mode_template_release, make_config_script_release, make_release_twice, make_release_twice_dev_mode, @@ -781,6 +782,37 @@ make_goalless_release(Config) -> relx:do(undefined, undefined, [], [LibDir1], 3, OutputDir, ConfigFile)). +make_external_goal_release(Config) -> + LibDir1 = proplists:get_value(lib1, Config), + + rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), + rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [], []), + rlx_test_utils:create_app(LibDir1, "goal_app_2", "0.0.1", [stdlib,kernel,goal_app_1,non_goal_2], []), + rlx_test_utils:create_app(LibDir1, "non_goal_1", "0.0.1", [stdlib,kernel], [lib_dep_1]), + rlx_test_utils:create_app(LibDir1, "non_goal_2", "0.0.1", [stdlib,kernel], []), + + ConfigFile = filename:join([LibDir1, "relx.config"]), + + ConfigFile = filename:join([LibDir1, "relx.config"]), + rlx_test_utils:write_config(ConfigFile, + [{goals, [{goal_app_2, "0.0.1"}]}, + {release, {foo, "0.0.1"}, + [goal_app_1]}]), + OutputDir = filename:join([proplists:get_value(priv_dir, Config), + rlx_test_utils:create_random_name("relx-output")]), + {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 3, + OutputDir, ConfigFile), + [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), + AppSpecs = rlx_release:applications(Release), + ?assert(lists:keymember(stdlib, 1, AppSpecs)), + ?assert(lists:keymember(kernel, 1, AppSpecs)), + ?assert(lists:member({non_goal_1, "0.0.1"}, AppSpecs)), + ?assert(lists:member({non_goal_2, "0.0.1"}, AppSpecs)), + ?assert(lists:member({goal_app_1, "0.0.1"}, AppSpecs)), + ?assert(lists:member({goal_app_2, "0.0.1"}, AppSpecs)), + ?assert(lists:member({lib_dep_1, "0.0.1", load}, AppSpecs)). + + make_depfree_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), -- cgit v1.2.3