diff options
author | Tristan Sloughter <[email protected]> | 2019-05-20 09:25:31 -0600 |
---|---|---|
committer | GitHub <[email protected]> | 2019-05-20 09:25:31 -0600 |
commit | 670a602f657eeb6ac17589407df8e43cf4d1be89 (patch) | |
tree | 097769798d2d6d00fe3e2ff8a17a04034bf52a8f /test/rlx_archive_SUITE.erl | |
parent | d903c6e52fd7a28e5cee8d0459f0e2ee795f2c93 (diff) | |
parent | cca2a6cade4d97b5b36ca7c055d25677860bdc5d (diff) | |
download | relx-670a602f657eeb6ac17589407df8e43cf4d1be89.tar.gz relx-670a602f657eeb6ac17589407df8e43cf4d1be89.tar.bz2 relx-670a602f657eeb6ac17589407df8e43cf4d1be89.zip |
Merge branch 'master' into goals_option
Diffstat (limited to 'test/rlx_archive_SUITE.erl')
-rw-r--r-- | test/rlx_archive_SUITE.erl | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/test/rlx_archive_SUITE.erl b/test/rlx_archive_SUITE.erl index 5122c11..8d30915 100644 --- a/test/rlx_archive_SUITE.erl +++ b/test/rlx_archive_SUITE.erl @@ -18,7 +18,7 @@ -include_lib("kernel/include/file.hrl"). suite() -> - [{timetrap, {seconds, 30}}]. + [{timetrap, {seconds, 120}}]. init_per_suite(Config) -> Config. @@ -55,11 +55,19 @@ basic_tar(Config) -> rlx_test_utils:create_app(LibDir1, "non_goal_1", "0.0.1", [stdlib,kernel], [lib_dep_1]), rlx_test_utils:create_app(LibDir1, "non_goal_2", "0.0.1", [stdlib,kernel], []), + SysConfigSrc = filename:join([LibDir1, "config", "sys.config.src"]), + rlx_test_utils:write_config(SysConfigSrc, [{this_is_a_test, "yup it is"}]), + + VmArgsSrc = filename:join([LibDir1, "config", "vm.args.src"]), + ec_file:write(VmArgsSrc, ""), + ConfigFile = filename:join([LibDir1, "relx.config"]), rlx_test_utils:write_config(ConfigFile, [{release, {foo, "0.0.1"}, [goal_app_1, - goal_app_2]}]), + goal_app_2]}, + {sys_config_src, SysConfigSrc}, + {vm_args_src, VmArgsSrc}]), OutputDir = filename:join([proplists:get_value(priv_dir, Config), rlx_test_utils:create_random_name("relx-output")]), {ok, State} = relx:do([{relname, foo}, @@ -84,6 +92,16 @@ basic_tar(Config) -> {ok, Files} = erl_tar:table(TarFile, [compressed]), ?assert(lists:any(fun(X) -> re:run(X, "lib/stdlib-.*/ebin/.*") =/= nomatch end, Files)), ?assert(lists:any(fun(X) -> re:run(X, "lib/kernel-.*/ebin/.*") =/= nomatch end, Files)), + + %% only works in otp-21 and above + case erlang:system_info(otp_release) of + R when R =:= "21" orelse R =:= "22" -> + ?assert(lists:member("releases/0.0.1/vm.args.src", Files)), + ?assert(lists:member("releases/0.0.1/sys.config.src", Files)); + _ -> + ok + end, + ?assert(filelib:is_regular(TarFile)). exclude_erts(Config) -> |