diff options
| author | Tristan Sloughter <[email protected]> | 2013-09-09 20:16:55 -0500 |
|---|---|---|
| committer | Tristan Sloughter <[email protected]> | 2013-09-11 20:07:33 -0500 |
| commit | ff0a11dc7b2e2ef902c97a62595b29e9bc89029a (patch) | |
| tree | a96c523adba91117ee3ce4cfa557155c0cc303db /test | |
| parent | 2f54b2d5360c52fff2c3f8fde73b29b6069174ea (diff) | |
| download | relx-ff0a11dc7b2e2ef902c97a62595b29e9bc89029a.tar.gz relx-ff0a11dc7b2e2ef902c97a62595b29e9bc89029a.tar.bz2 relx-ff0a11dc7b2e2ef902c97a62595b29e9bc89029a.zip | |
allow multiple actions, including new action tar
Diffstat (limited to 'test')
| -rw-r--r-- | test/rlx_discover_SUITE.erl | 2 | ||||
| -rw-r--r-- | test/rlx_release_SUITE.erl | 14 |
2 files changed, 6 insertions, 10 deletions
diff --git a/test/rlx_discover_SUITE.erl b/test/rlx_discover_SUITE.erl index d225ee6..d404d8c 100644 --- a/test/rlx_discover_SUITE.erl +++ b/test/rlx_discover_SUITE.erl @@ -46,7 +46,7 @@ init_per_testcase(_, Config) -> LibDir2 = filename:join([DataDir, create_random_name("lib_dir2_")]), ok = rlx_util:mkdir_p(LibDir1), ok = rlx_util:mkdir_p(LibDir2), - State = rlx_state:new([{lib_dirs, [LibDir1, LibDir2]}], release), + State = rlx_state:new([{lib_dirs, [LibDir1, LibDir2]}], [release]), [{lib1, LibDir1}, {lib2, LibDir2}, {state, State} | Config]. diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl index ea4b20d..ccf5a8f 100644 --- a/test/rlx_release_SUITE.erl +++ b/test/rlx_release_SUITE.erl @@ -56,7 +56,7 @@ 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]), [{lib1, LibDir1}, {state, State} | Config]. @@ -602,7 +602,7 @@ make_relup_release(Config) -> {lib_dirs, [LibDir1]}, {log_level, 2}, {output_dir, OutputDir}, - {config, ConfigFile}], ["relup"]), + {config, ConfigFile}], ["release", "relup"]), %% we should have one 'resolved' release and three discovered realized_releases. ?assertMatch([{foo, "0.0.1"}, @@ -619,9 +619,7 @@ make_relup_release(Config) -> ?assertMatch({ok, [{"0.0.3", [{"0.0.2",[],[point_of_no_return]}], [{"0.0.2",[],[point_of_no_return]}]}]}, - file:consult(filename:join(filename:dirname(rlx_release:relfile(Release)), - filename:basename(rlx_release:relfile(Release), ".rel") ++ - ".relup"))), + file:consult(filename:join(filename:dirname(rlx_release:relfile(Release)), "relup"))), ?assertMatch(foo, rlx_release:name(Release)), ?assertMatch("0.0.3", rlx_release:vsn(Release)), @@ -685,7 +683,7 @@ make_relup_release2(Config) -> {lib_dirs, [LibDir1]}, {log_level, 2}, {output_dir, OutputDir}, - {config, ConfigFile}], ["relup"]), + {config, ConfigFile}], ["release", "relup"]), %% we should have one 'resolved' release and three discovered realized_releases. ?assertMatch([{foo, "0.0.1"}, @@ -702,9 +700,7 @@ make_relup_release2(Config) -> ?assertMatch({ok, [{"0.0.3", [{"0.0.1",[],[point_of_no_return]}], [{"0.0.1",[],[point_of_no_return]}]}]}, - file:consult(filename:join(filename:dirname(rlx_release:relfile(Release)), - filename:basename(rlx_release:relfile(Release), ".rel") ++ - ".relup"))), + file:consult(filename:join(filename:dirname(rlx_release:relfile(Release)), "relup"))), ?assertMatch(foo, rlx_release:name(Release)), ?assertMatch("0.0.3", rlx_release:vsn(Release)), |