diff options
| author | Björn Gustavsson <[email protected]> | 2015-10-15 11:48:26 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-10-15 11:48:26 +0200 |
| commit | 3ff3cf5e7dcb9131ed338b4e828de381b0fc391d (patch) | |
| tree | 5f6081ceca45828243f9f20d8d8353b5a0c35b27 /lib/sasl | |
| parent | f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2 (diff) | |
| parent | d8ff1e37c38c37304fb44ba6618da141e4d08c21 (diff) | |
| download | otp-3ff3cf5e7dcb9131ed338b4e828de381b0fc391d.tar.gz otp-3ff3cf5e7dcb9131ed338b4e828de381b0fc391d.tar.bz2 otp-3ff3cf5e7dcb9131ed338b4e828de381b0fc391d.zip | |
Merge branch 'bjorn/remove-webtool/OTP-13004'
* bjorn/remove-webtool/OTP-13004:
Remove the deprecated webtool application
Diffstat (limited to 'lib/sasl')
| -rw-r--r-- | lib/sasl/test/systools_SUITE.erl | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl index cf0ed5fcfc..825a7f6e86 100644 --- a/lib/sasl/test/systools_SUITE.erl +++ b/lib/sasl/test/systools_SUITE.erl @@ -1640,25 +1640,21 @@ app_start_type_relup(Dir2,Name2,Config) -> %% ?t:format("Dn: ~p",[DownInstructions]), [{load_object_code, {mnesia, _, _}}, {load_object_code, {runtime_tools, _, _}}, - {load_object_code, {webtool, _, _}}, {load_object_code, {snmp, _, _}}, {load_object_code, {xmerl, _, _}}, point_of_no_return | UpInstructionsT] = UpInstructions, true = lists:member({apply,{application,start,[mnesia,permanent]}}, UpInstructionsT), true = lists:member({apply,{application,start,[runtime_tools,transient]}}, UpInstructionsT), - true = lists:member({apply,{application,start,[webtool,temporary]}}, UpInstructionsT), true = lists:member({apply,{application,load,[snmp]}}, UpInstructionsT), false = lists:any(fun({apply,{application,_,[xmerl|_]}}) -> true; (_) -> false end, UpInstructionsT), [point_of_no_return | DownInstructionsT] = DownInstructions, true = lists:member({apply,{application,stop,[mnesia]}}, DownInstructionsT), true = lists:member({apply,{application,stop,[runtime_tools]}}, DownInstructionsT), - true = lists:member({apply,{application,stop,[webtool]}}, DownInstructionsT), true = lists:member({apply,{application,stop,[snmp]}}, DownInstructionsT), true = lists:member({apply,{application,stop,[xmerl]}}, DownInstructionsT), true = lists:member({apply,{application,unload,[mnesia]}}, DownInstructionsT), true = lists:member({apply,{application,unload,[runtime_tools]}}, DownInstructionsT), - true = lists:member({apply,{application,unload,[webtool]}}, DownInstructionsT), true = lists:member({apply,{application,unload,[snmp]}}, DownInstructionsT), true = lists:member({apply,{application,unload,[xmerl]}}, DownInstructionsT), ok. @@ -2207,7 +2203,6 @@ create_script(latest_app_start_type1,Config) -> create_script(latest_app_start_type2,Config) -> OtherApps = [{mnesia,current,permanent}, {runtime_tools,current,transient}, - {webtool,current,temporary}, {snmp,current,load}, {xmerl,current,none}], Apps = core_apps(current) ++ OtherApps, |