diff options
| author | Eric <[email protected]> | 2012-09-18 15:51:07 -0700 |
|---|---|---|
| committer | Eric <[email protected]> | 2012-09-18 15:51:53 -0700 |
| commit | 388b5f05a634225dcc746293850948a02951330a (patch) | |
| tree | b8973879485f1b185f214d0814b5b69341d0366b | |
| parent | 0a830ae52f7720b8215d616e0b22f3e961571ca2 (diff) | |
| download | relx-388b5f05a634225dcc746293850948a02951330a.tar.gz relx-388b5f05a634225dcc746293850948a02951330a.tar.bz2 relx-388b5f05a634225dcc746293850948a02951330a.zip | |
minor formatting and cleanup
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | src/rcl_prv_config.erl | 4 | ||||
| -rw-r--r-- | test/rclt_release_SUITE.erl | 10 |
3 files changed, 7 insertions, 10 deletions
@@ -80,7 +80,8 @@ $(RELCOOL_PLT): --apps erts kernel stdlib -r deps dialyzer: $(RELCOOL_PLT) - dialyzer --plt $(RELCOOL_PLT) --fullpath -Wrace_conditions -I include -pa $(CURDIR)/ebin --src src + dialyzer --plt $(RELCOOL_PLT) --fullpath -Wrace_conditions \ + -I include -pa $(CURDIR)/ebin --src src typer: typer --plt $(RELCOOL_PLT) -r ./src diff --git a/src/rcl_prv_config.erl b/src/rcl_prv_config.erl index 5d97ce5..e75bf85 100644 --- a/src/rcl_prv_config.erl +++ b/src/rcl_prv_config.erl @@ -85,7 +85,7 @@ load_terms({add_providers, Providers0}, {ok, State0}) -> load_terms({release, {RelName, Vsn}, Applications}, {ok, State0}) -> Release0 = rcl_release:new(RelName, Vsn), case rcl_release:goals(Release0, Applications) of - {_, E={error, _}} -> + E={error, _} -> E; {ok, Release1} -> {ok, rcl_state:add_release(State0, Release1)} @@ -94,7 +94,7 @@ load_terms({release, {RelName, Vsn}, {erts, ErtsVsn}, Applications}, {ok, State}) -> Release0 = rcl_release:erts(rcl_release:new(RelName, Vsn), ErtsVsn), case rcl_release:goals(Release0, Applications) of - {_, E={error, _}} -> + E={error, _} -> E; {ok, Release1} -> {ok, rcl_state:add_release(State, Release1)} diff --git a/test/rclt_release_SUITE.erl b/test/rclt_release_SUITE.erl index ae19b29..5abc218 100644 --- a/test/rclt_release_SUITE.erl +++ b/test/rclt_release_SUITE.erl @@ -24,7 +24,7 @@ end_per_suite/1, init_per_testcase/2, all/0, - normal_case/1]). + make_release/1]). -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). @@ -47,9 +47,9 @@ init_per_testcase(_, Config) -> {state, State} | Config]. all() -> - [normal_case]. + [make_release]. -normal_case(Config) -> +make_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), [(fun({Name, Vsn}) -> create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) @@ -65,7 +65,6 @@ normal_case(Config) -> create_app(LibDir1, "non_goal_1", "0.0.1", [stdlib,kernel], [lib_dep_1]), create_app(LibDir1, "non_goal_2", "0.0.1", [stdlib,kernel], []), - ConfigFile = filename:join([LibDir1, "relcool.config"]), write_config(ConfigFile, [{release, {foo, "0.0.1"}, @@ -85,9 +84,6 @@ normal_case(Config) -> ?assert(lists:member({goal_app_2, "0.0.1"}, AppSpecs)), ?assert(lists:member({lib_dep_1, "0.0.1", load}, AppSpecs)). - - - %%%=================================================================== %%% Helper Functions %%%=================================================================== |