diff options
| author | Tristan Sloughter <[email protected]> | 2014-05-07 19:32:17 -0500 |
|---|---|---|
| committer | Tristan Sloughter <[email protected]> | 2014-05-14 16:06:09 -0500 |
| commit | 7d3626779ce5716055b31eed76feb81a9fcb2210 (patch) | |
| tree | 13d5dc9d810489c8bcbaf5470a37f45259f4318e /test/rlx_release_SUITE.erl | |
| parent | 227b1ec27d9b4c186366a64f81628843c8a8cc3e (diff) | |
| download | relx-7d3626779ce5716055b31eed76feb81a9fcb2210.tar.gz relx-7d3626779ce5716055b31eed76feb81a9fcb2210.tar.bz2 relx-7d3626779ce5716055b31eed76feb81a9fcb2210.zip | |
refactor cli args and config file var merging
Diffstat (limited to 'test/rlx_release_SUITE.erl')
| -rw-r--r-- | test/rlx_release_SUITE.erl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl index 730e1d1..0382a26 100644 --- a/test/rlx_release_SUITE.erl +++ b/test/rlx_release_SUITE.erl @@ -60,9 +60,11 @@ init_per_testcase(_, Config) -> DataDir = proplists:get_value(data_dir, Config), LibDir1 = filename:join([DataDir, create_random_name("lib_dir1_")]), ok = rlx_util:mkdir_p(LibDir1), - State = rlx_state:new([{lib_dirs, [LibDir1]}], [release]), + State = rlx_state:new([], [{lib_dirs, [LibDir1]}], [release]), + {ConfigProvider, {ok, State1}} = rlx_provider:new(rlx_prv_config, State), + {ok, State2} = rlx_provider:do(ConfigProvider, State1), [{lib1, LibDir1}, - {state, State} | Config]. + {state, State2} | Config]. all() -> [make_release, make_extend_release, make_scriptless_release, @@ -563,10 +565,10 @@ overlay_release(Config) -> ?assert(lists:member({goal_app_2, "0.0.1"}, AppSpecs)), ?assert(lists:member({lib_dep_1, "0.0.1", load}, AppSpecs)), - ?assert(ec_file:exists(filename:join([OutputDir, "foo", "fooo"]))), - ?assert(ec_file:exists(filename:join([OutputDir, "foo", "foodir", "vars1.config"]))), - ?assert(ec_file:exists(filename:join([OutputDir, "foo", "yahoo", "vars1.config"]))), - ?assert(ec_file:exists(filename:join([OutputDir, "foo", SecondTestDir, TestDir, TestFile]))), + ?assert(ec_file:exists(filename:join(OutputDir, "fooo"))), + ?assert(ec_file:exists(filename:join([OutputDir, "foodir", "vars1.config"]))), + ?assert(ec_file:exists(filename:join([OutputDir, "yahoo", "vars1.config"]))), + ?assert(ec_file:exists(filename:join([OutputDir, SecondTestDir, TestDir, TestFile]))), TemplateData = case file:consult(filename:join([OutputDir, "foo", "test_template_resolved"])) of {ok, Details} -> |