diff options
author | Jordan Wilberding <[email protected]> | 2013-01-25 04:14:05 -0800 |
---|---|---|
committer | Jordan Wilberding <[email protected]> | 2013-01-25 04:14:05 -0800 |
commit | e29f7fa585670f2bb1aad6060bfa2fe0aeba1cd8 (patch) | |
tree | ccc9c612deac643818f62166c2827c018574f0b6 /test | |
parent | 1a43e62a5ee0ceafb2082a41e632489b48e7f567 (diff) | |
parent | 58f0df46df654f6221aff6534477b5df1076e0fa (diff) | |
download | relx-e29f7fa585670f2bb1aad6060bfa2fe0aeba1cd8.tar.gz relx-e29f7fa585670f2bb1aad6060bfa2fe0aeba1cd8.tar.bz2 relx-e29f7fa585670f2bb1aad6060bfa2fe0aeba1cd8.zip |
Merge pull request #21 from ericbmerritt/next
working towards release upgrades
Diffstat (limited to 'test')
-rw-r--r-- | test/rclt_command_SUITE.erl | 4 | ||||
-rw-r--r-- | test/rclt_discover_SUITE.erl | 4 | ||||
-rw-r--r-- | test/rclt_goal.erl | 2 | ||||
-rw-r--r-- | test/rclt_release_SUITE.erl | 26 |
4 files changed, 18 insertions, 18 deletions
diff --git a/test/rclt_command_SUITE.erl b/test/rclt_command_SUITE.erl index bd99da0..3d06dad 100644 --- a/test/rclt_command_SUITE.erl +++ b/test/rclt_command_SUITE.erl @@ -1,4 +1,4 @@ -%%% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*- +%% -*- erlang-indent-level: 4; indent-tabs-mode: nil; fill-column: 92 -*- %%% Copyright 2012 Erlware, LLC. All Rights Reserved. %%% %%% This file is provided to you under the Apache License, @@ -88,6 +88,6 @@ spec_parse_fail_case(_Config) -> config_fail_case(_Config) -> ConfigFile = "does-not-exist", - CmdLine = [ConfigFile], + CmdLine = ["-c", ConfigFile], ?assertMatch({error, {_, {invalid_config_file, ConfigFile}}}, rcl_cmd_args:args2state(getopt:parse(relcool:opt_spec_list(), CmdLine))). diff --git a/test/rclt_discover_SUITE.erl b/test/rclt_discover_SUITE.erl index 6b61840..4b6cb2a 100644 --- a/test/rclt_discover_SUITE.erl +++ b/test/rclt_discover_SUITE.erl @@ -1,4 +1,4 @@ -%%% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*- +%% -*- erlang-indent-level: 4; indent-tabs-mode: nil; fill-column: 92 -*- %%% Copyright 2012 Erlware, LLC. All Rights Reserved. %%% %%% This file is provided to you under the Apache License, @@ -46,7 +46,7 @@ init_per_testcase(_, Config) -> LibDir2 = filename:join([DataDir, create_random_name("lib_dir2_")]), ok = rcl_util:mkdir_p(LibDir1), ok = rcl_util:mkdir_p(LibDir2), - State = rcl_state:new([{lib_dirs, [LibDir1, LibDir2]}], []), + State = rcl_state:new([{lib_dirs, [LibDir1, LibDir2]}], release), [{lib1, LibDir1}, {lib2, LibDir2}, {state, State} | Config]. diff --git a/test/rclt_goal.erl b/test/rclt_goal.erl index 9bf6028..20fb5e5 100644 --- a/test/rclt_goal.erl +++ b/test/rclt_goal.erl @@ -1,4 +1,4 @@ -%%% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*- +%% -*- erlang-indent-level: 4; indent-tabs-mode: nil; fill-column: 92 -*- %%% Copyright 2012 Erlware, LLC. All Rights Reserved. %%% %%% This file is provided to you under the Apache License, diff --git a/test/rclt_release_SUITE.erl b/test/rclt_release_SUITE.erl index 9c9c70c..95aa385 100644 --- a/test/rclt_release_SUITE.erl +++ b/test/rclt_release_SUITE.erl @@ -1,4 +1,4 @@ -%%% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*- +%% -*- erlang-indent-level: 4; indent-tabs-mode: nil; fill-column: 92 -*- %%% Copyright 2012 Erlware, LLC. All Rights Reserved. %%% %%% This file is provided to you under the Apache License, @@ -52,7 +52,7 @@ init_per_testcase(_, Config) -> DataDir = proplists:get_value(data_dir, Config), LibDir1 = filename:join([DataDir, create_random_name("lib_dir1_")]), ok = rcl_util:mkdir_p(LibDir1), - State = rcl_state:new([{lib_dirs, [LibDir1]}], []), + State = rcl_state:new([{lib_dirs, [LibDir1]}], release), [{lib1, LibDir1}, {state, State} | Config]. @@ -86,7 +86,7 @@ make_release(Config) -> OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relcool-output")]), {ok, State} = relcool:do(undefined, undefined, [], [LibDir1], 2, - OutputDir, [ConfigFile]), + OutputDir, ConfigFile), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rcl_state:releases(State)), AppSpecs = rcl_release:applications(Release), ?assert(lists:keymember(stdlib, 1, AppSpecs)), @@ -122,7 +122,7 @@ make_invalid_config_release(Config) -> create_random_name("relcool-output")]), {error, {rcl_prv_config, {consult, _, _}}} = relcool:do(undefined, undefined, [], [LibDir1], 2, - OutputDir, [ConfigFile]). + OutputDir, ConfigFile). make_scriptless_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), @@ -149,7 +149,7 @@ make_scriptless_release(Config) -> OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relcool-output")]), {ok, State} = relcool:do(undefined, undefined, [], [LibDir1], 2, - OutputDir, [ConfigFile]), + OutputDir, ConfigFile), ?assert(not ec_file:exists(filename:join([OutputDir, "bin", "foo"]))), ?assert(not ec_file:exists(filename:join([OutputDir, "bin", "foo-0.0.1"]))), @@ -200,7 +200,7 @@ make_overridden_release(Config) -> {ok, Cwd} = file:get_cwd(), {ok, State} = relcool:do(Cwd, undefined, undefined, [], [LibDir1], 2, OutputDir, [{OverrideAppName, OverrideAppDir}], - [ConfigFile]), + ConfigFile), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rcl_state:releases(State)), AppSpecs = rcl_release:applications(Release), ?assert(lists:keymember(stdlib, 1, AppSpecs)), @@ -289,13 +289,13 @@ make_rerun_overridden_release(Config) -> create_random_name("relcool-output")]), {ok, Cwd} = file:get_cwd(), {ok, State} = relcool:do(Cwd, undefined, undefined, [], [LibDir1], 2, - OutputDir, [{OverrideAppName, OverrideAppDir}], - [ConfigFile]), + OutputDir, [{OverrideAppName, OverrideAppDir}], + ConfigFile), %% Now we run it again to see if it failse. {ok, State} = relcool:do(Cwd,undefined, undefined, [], [LibDir1], 2, - OutputDir, [{OverrideAppName, OverrideAppDir}], - [ConfigFile]), + OutputDir, [{OverrideAppName, OverrideAppDir}], + ConfigFile), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rcl_state:releases(State)), AppSpecs = rcl_release:applications(Release), @@ -358,7 +358,7 @@ overlay_release(Config) -> create_random_name("relcool-output")]), {ok, State} = relcool:do(undefined, undefined, [], [LibDir1], 2, - OutputDir, [ConfigFile]), + OutputDir, ConfigFile), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rcl_state:releases(State)), AppSpecs = rcl_release:applications(Release), @@ -469,7 +469,7 @@ make_goalless_release(Config) -> create_random_name("relcool-output")]), ?assertMatch({error,{rcl_prv_release,no_goals_specified}}, relcool:do(undefined, undefined, [], [LibDir1], 2, - OutputDir, [ConfigFile])). + OutputDir, ConfigFile)). make_depfree_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), @@ -494,7 +494,7 @@ make_depfree_release(Config) -> OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relcool-output")]), {ok, State} = relcool:do(undefined, undefined, [], [LibDir1], 2, - OutputDir, [ConfigFile]), + OutputDir, ConfigFile), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rcl_state:releases(State)), AppSpecs = rcl_release:applications(Release), ?assert(lists:keymember(stdlib, 1, AppSpecs)), |