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_command_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_command_SUITE.erl')
| -rw-r--r-- | test/rlx_command_SUITE.erl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/rlx_command_SUITE.erl b/test/rlx_command_SUITE.erl index 2e1ef1d..e26e0ad 100644 --- a/test/rlx_command_SUITE.erl +++ b/test/rlx_command_SUITE.erl @@ -61,15 +61,17 @@ normal_passing_case(Config) -> "-n", RelName, "-v", RelVsn, "-o", Outdir], {ok, {Opts, Targets}} = getopt:parse(relx:opt_spec_list(), CmdLine), {ok, State} = rlx_cmd_args:args2state(Opts, Targets), + {ConfigProvider, {ok, State1}} = rlx_provider:new(rlx_prv_config, State), + {ok, State2} = rlx_provider:do(ConfigProvider, State1), ?assertMatch([Lib1, Lib2], - rlx_state:lib_dirs(State)), - ?assertMatch(Outdir, rlx_state:base_output_dir(State)), + rlx_state:lib_dirs(State2)), + ?assertMatch(Outdir, rlx_state:output_dir(State2)), ?assertMatch([{app1,{{33,33},{[],[<<"build4">>]}},lte}, {app2, {{33,22},{[],[]}}, {{45,22},{[],[<<"build">>,21]}}, between}], - rlx_state:goals(State)). + rlx_state:goals(State2)). lib_expansion_case(Config) -> DataDir = proplists:get_value(data_dir, Config), @@ -81,8 +83,10 @@ lib_expansion_case(Config) -> CmdLine = ["-l", filename:join(DataDir, "*")], {ok, {Opts, Targets}} = getopt:parse(relx:opt_spec_list(), CmdLine), {ok, State} = rlx_cmd_args:args2state(Opts, Targets), + {ConfigProvider, {ok, State1}} = rlx_provider:new(rlx_prv_config, State), + {ok, State2} = rlx_provider:do(ConfigProvider, State1), ?assertMatch([Lib1, Lib2], - rlx_state:lib_dirs(State)). + rlx_state:lib_dirs(State2)). lib_fail_case(Config) -> DataDir = proplists:get_value(data_dir, Config), |