Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sasl: include appup files in release package #8973

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −1
Open

sasl: include appup files in release package #8973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/sasl/src/systools_make.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1899,6 +1899,9 @@ add_appl(Name, Vsn, App, Tar, Variables, Flags, Var) ->
add_to_tar(Tar,
filename:join(AppDir, Name ++ ".app"),
filename:join(BinDir, Name ++ ".app")),
add_to_tar(Tar,
filename:join(AppDir, Name ++ ".appup"),
filename:join(BinDir, Name ++ ".appup")),
add_modules(map(fun(Mod) -> to_list(Mod) end,
App#application.modules),
Tar,
Expand Down
24 changes: 23 additions & 1 deletion lib/sasl/test/systools_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
[tar_options, relname_tar, normal_tar, no_mod_vsn_tar, system_files_tar,
system_src_file_tar, invalid_system_files_tar, variable_tar,
src_tests_tar, var_tar, exref_tar, link_tar, no_sasl_tar,
otp_9507_path_ebin, additional_files_tar, erts_tar]},
otp_9507_path_ebin, additional_files_tar, erts_tar, appup_tar]},
{relup, [],
[normal_relup, restart_relup, abnormal_relup, no_sasl_relup,
no_appup_relup, bad_appup_relup, app_start_type_relup, regexp_relup,
Expand Down Expand Up @@ -1514,7 +1514,7 @@
ok = file:set_cwd(LatestDir),

{ok, _, _} = systools:make_script(LatestName, [silent, {path, P}]),
ok = systools:make_tar(LatestName, [{path, P}]),

Check warning on line 1517 in lib/sasl/test/systools_SUITE.erl

View workflow job for this annotation

GitHub Actions / CT Test Results

no_sasl_tar failed 

artifacts/Unit Test Results/sasl_junit.xml [took 0s]
Raw output 
Test no_sasl_tar in systools_SUITE failed!
{{badmatch,error},
 [{systools_SUITE,no_sasl_tar,1,[{file,"systools_SUITE.erl"},{line,1517}]},
  {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1794}]},
  {test_server,run_test_case_eval1,6,[{file,"test_server.erl"},{line,1303}]},
  {test_server,run_test_case_eval,9,[{file,"test_server.erl"},{line,1235}]}]}
{ok, _, [{warning,missing_sasl}]} =
systools:make_tar(LatestName, [{path, P}, silent]),
{ok, _, []} =
Expand Down Expand Up @@ -1571,6 +1571,28 @@

ok.

%% make_tar: Check application upgrade file included
appup_tar(Config) when is_list(Config) ->
{ok, OldDir} = file:get_cwd(),

{LatestDir, LatestName} = create_script(latest_no_mod_vsn,Config),

DataDir = filename:absname(?copydir),
LibDir = fname([DataDir, d_normal, lib]),
P = [fname([LibDir, 'db-3.1', ebin]),
fname([LibDir, 'fe-3.1', ebin])],

ok = file:set_cwd(LatestDir),

{ok, _, []} = systools:make_script(LatestName, [silent, {path, P}, {script_name, "start"}]),
ok = systools:make_tar(LatestName, [{path, P}]),
ok = check_tar(fname([lib,'db-3.1',ebin,'db.appup']), LatestName),
{ok, _, []} = systools:make_tar(LatestName, [{path, P}, silent]),
ok = check_tar(fname([lib,'fe-3.1',ebin,'fe.appup']), LatestName),

ok = file:set_cwd(OldDir),
ok.


%% make_relup: Check normal case
normal_relup(Config) when is_list(Config) ->
Expand Down
Loading