From 292eea4c105adb03e0745468db6bb4948e6df98d Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 31 Jan 2015 15:57:13 -0600 Subject: don't overdo it with generated apps that are there to be ignored --- test/rlx_release_SUITE.erl | 120 +++------------------------------------------ 1 file changed, 6 insertions(+), 114 deletions(-) (limited to 'test') diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl index e7b6c22..eeab491 100644 --- a/test/rlx_release_SUITE.erl +++ b/test/rlx_release_SUITE.erl @@ -78,13 +78,14 @@ all() -> make_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), + [(fun({Name, Vsn}) -> rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) end)(App) - || + || App <- [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], + || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []), @@ -116,13 +117,6 @@ make_release(Config) -> make_extend_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []), @@ -158,13 +152,6 @@ make_extend_release(Config) -> make_invalid_config_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []), @@ -185,13 +172,6 @@ make_invalid_config_release(Config) -> make_scriptless_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []), @@ -227,13 +207,7 @@ make_overridden_release(Config) -> DataDir = proplists:get_value(data_dir, Config), OverrideDir1 = filename:join([DataDir, rlx_test_utils:create_random_name("override_dir_")]), LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], + OverrideApp = rlx_test_utils:create_random_name("override_app"), OverrideVsn = rlx_test_utils:create_random_vsn(), OverrideAppDir = filename:join(OverrideDir1, OverrideApp ++ "-" ++ OverrideVsn), @@ -275,13 +249,6 @@ make_overridden_release(Config) -> make_skip_app_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []), @@ -341,13 +308,7 @@ make_auto_skip_empty_app_release(Config) -> DataDir = proplists:get_value(data_dir, Config), EmptyAppDir1 = filename:join([DataDir, rlx_test_utils:create_random_name("skip_app_dir_")]), LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], + EmptyAppApp = rlx_test_utils:create_random_name("empty_app_app"), EmptyAppVsn = rlx_test_utils:create_random_vsn(), EmptyAppAppName = erlang:list_to_atom(EmptyAppApp), @@ -384,13 +345,6 @@ make_auto_skip_empty_app_release(Config) -> make_app_type_none_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []), @@ -423,13 +377,6 @@ make_implicit_config_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), FooRoot = filename:join([LibDir1, "foodir1", "foodir2"]), filelib:ensure_dir(filename:join([FooRoot, "tmp"])), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []), @@ -463,13 +410,7 @@ make_rerun_overridden_release(Config) -> DataDir = proplists:get_value(data_dir, Config), OverrideDir1 = filename:join([DataDir, rlx_test_utils:create_random_name("override_dir_")]), LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], + OverrideApp = rlx_test_utils:create_random_name("override_app"), OverrideVsn = rlx_test_utils:create_random_vsn(), OverrideAppDir = filename:join(OverrideDir1, OverrideApp ++ "-" @@ -520,13 +461,6 @@ make_rerun_overridden_release(Config) -> overlay_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []), @@ -675,13 +609,6 @@ overlay_release(Config) -> make_goalless_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [], []), @@ -701,13 +628,6 @@ make_goalless_release(Config) -> make_depfree_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [kernel,stdlib], []), rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [kernel,stdlib], []), @@ -730,13 +650,6 @@ make_depfree_release(Config) -> make_relup_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.2", [stdlib,kernel,non_goal_1], []), @@ -817,13 +730,6 @@ make_relup_release(Config) -> make_relup_release2(Config) -> LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.2", [stdlib,kernel,non_goal_1], []), @@ -921,13 +827,6 @@ make_one_app_top_level_release(Config) -> make_dev_mode_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []), @@ -969,13 +868,6 @@ make_config_script_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), FooRoot = filename:join([LibDir1, "foodir1", "foodir2"]), filelib:ensure_dir(filename:join([FooRoot, "tmp"])), - [(fun({Name, Vsn}) -> - rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], []) - end)(App) - || - App <- - [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()} - || _ <- lists:seq(1, 100)]], rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []), -- cgit v1.2.3