diff options
author | Siri Hansen <siri@erlang.org> | 2012-01-30 14:43:06 +0100 |
---|---|---|
committer | Siri Hansen <siri@erlang.org> | 2012-03-19 09:48:53 +0100 |
commit | 523573110b7afc1491c1e67865303da2468bcf0f (patch) | |
tree | 60ce079a244b9cb7d2d22f2c5db02484aa1d2659 /lib/reltool/src | |
parent | 3fef8ee7031a16a038c9f87dc8cf8ea44064e6ed (diff) | |
download | otp-523573110b7afc1491c1e67865303da2468bcf0f.tar.gz otp-523573110b7afc1491c1e67865303da2468bcf0f.tar.bz2 otp-523573110b7afc1491c1e67865303da2468bcf0f.zip |
[reltool] Add tests for sorting of applications in .rel and .script files
OTP-9794
Test cases create_release_sort and create_script_sort are added. The
test are temporarily skipped since they detected quite a few bugs that
will be corrected with OTP-9792.
The following bug is corrected in this commit:'
reltool_server did not recognize {App,InclApps} inside a 'rel'
specification in the reltool config, e.g.
{rel, "myrel", "1.0", [{myapp,[app2]}]}.
Diffstat (limited to 'lib/reltool/src')
-rw-r--r-- | lib/reltool/src/reltool_server.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl index 7dc2d21158..fcd1ad393e 100644 --- a/lib/reltool/src/reltool_server.erl +++ b/lib/reltool/src/reltool_server.erl @@ -1510,11 +1510,11 @@ decode(#rel{rel_apps = RelApps} = Rel, [RelApp | KeyVals], Status) -> case RelApp of Name when is_atom(Name) -> {true, #rel_app{name = Name}}; - {Name, Type} when is_atom(Name) -> - {is_type(Type), #rel_app{name = Name, app_type = Type}}; {Name, InclApps} when is_atom(Name), is_list(InclApps) -> VI = lists:all(fun erlang:is_atom/1, InclApps), {VI, #rel_app{name = Name, incl_apps = InclApps}}; + {Name, Type} when is_atom(Name) -> + {is_type(Type), #rel_app{name = Name, app_type = Type}}; {Name, Type, InclApps} when is_atom(Name), is_list(InclApps) -> VT = is_type(Type), VI = lists:all(fun erlang:is_atom/1, InclApps), @@ -1606,7 +1606,7 @@ check_app({RelName, AppName}, Apps, Status) -> Status; _ -> Text = lists:concat(["Release ", RelName, - " uses non included application ", + " uses non included application ", AppName]), reltool_utils:return_first_error(Status, Text) end. |