diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-01-17 12:30:20 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-01-17 12:30:20 +0100 |
| commit | 60cabff61c07f5d5cb9dde1eb6b8e73897a0f928 (patch) | |
| tree | 098c829a13ea565e5152221527defa0b9bce6a36 /lib/kernel/test | |
| parent | cc7e26049cae8cb95793cf9af98424907a2ce644 (diff) | |
| parent | 37654ca0993d24753d6596f7a5e4e784030092c4 (diff) | |
| download | otp-60cabff61c07f5d5cb9dde1eb6b8e73897a0f928.tar.gz otp-60cabff61c07f5d5cb9dde1eb6b8e73897a0f928.tar.bz2 otp-60cabff61c07f5d5cb9dde1eb6b8e73897a0f928.zip | |
Merge branch 'sal/get_env/OTP-10694'
* sal/get_env/OTP-10694:
Moved documentation in a separate entry
Removed obsolete ?line macro
Add application:get_key/3
Diffstat (limited to 'lib/kernel/test')
| -rw-r--r-- | lib/kernel/test/application_SUITE.erl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl index f469a0af98..2ca8840e1f 100644 --- a/lib/kernel/test/application_SUITE.erl +++ b/lib/kernel/test/application_SUITE.erl @@ -27,7 +27,7 @@ otp_1586/1, otp_2078/1, otp_2012/1, otp_2718/1, otp_2973/1, otp_3002/1, otp_3184/1, otp_4066/1, otp_4227/1, otp_5363/1, otp_5606/1, - start_phases/1, get_key/1, + start_phases/1, get_key/1, get_env/1, permit_false_start_local/1, permit_false_start_dist/1, script_start/1, nodedown_start/1, init2973/0, loop2973/0, loop5606/1]). @@ -49,7 +49,7 @@ all() -> [failover, failover_comp, permissions, load, load_use_cache, {group, reported_bugs}, start_phases, script_start, nodedown_start, permit_false_start_local, - permit_false_start_dist, get_key, + permit_false_start_dist, get_key, get_env, {group, distr_changed}, config_change, shutdown_func, shutdown_timeout]. groups() -> @@ -1503,6 +1503,15 @@ loop5606(Pid) -> Pid ! {self(), Res} end. +get_env(suite) -> []; +get_env(doc) -> + ["Tests get_env/* functions"]; +get_env(Conf) when is_list(Conf) -> + {ok, _} = application:get_env(kernel, error_logger), + undefined = application:get_env(undefined_app, a), + undefined = application:get_env(kernel, error_logger_xyz), + default = application:get_env(kernel, error_logger_xyz, default), + ok. %%----------------------------------------------------------------- %% Should be started in a CC view with: |