diff options
| author | Siri Hansen <[email protected]> | 2014-02-24 11:03:40 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-02-24 11:08:57 +0100 |
| commit | cd03c9678083fd348c7778f53f3357f623ad65d5 (patch) | |
| tree | 15d8ba0ff98109f7be250ce5283a6e440a46b264 /lib/runtime_tools | |
| parent | 7211dab352a2b5141c260680f2077ca792768b37 (diff) | |
| parent | beae7ae0dab99a34ac6a6471feb8a7b9b2a3ed32 (diff) | |
| download | otp-cd03c9678083fd348c7778f53f3357f623ad65d5.tar.gz otp-cd03c9678083fd348c7778f53f3357f623ad65d5.tar.bz2 otp-cd03c9678083fd348c7778f53f3357f623ad65d5.zip | |
Merge branch 'schlagert/fix_basic_appups'
* schlagert/fix_basic_appups:
Dynamically configure typer_SUITE according to environment
Disable hipe_SUITE when environment doesn't support it
Make hipe non-upgradable by setting appup file empty
Fix missing module on hipe app file template
Add test suites performing app and appup file checks
Introduce appup test utility
Fix library application appup files
Fix non-library appup files according to issue #240
OTP-11744
Diffstat (limited to 'lib/runtime_tools')
| -rw-r--r-- | lib/runtime_tools/src/runtime_tools.appup.src | 10 | ||||
| -rw-r--r-- | lib/runtime_tools/test/runtime_tools_SUITE.erl | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lib/runtime_tools/src/runtime_tools.appup.src b/lib/runtime_tools/src/runtime_tools.appup.src index 7a435e9b22..0c2bab316f 100644 --- a/lib/runtime_tools/src/runtime_tools.appup.src +++ b/lib/runtime_tools/src/runtime_tools.appup.src @@ -1,7 +1,7 @@ -%% +%% -*- erlang -*- %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2009. All Rights Reserved. +%% Copyright Ericsson AB 2001-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -15,5 +15,7 @@ %% under the License. %% %% %CopyrightEnd% -%% -{"%VSN%",[],[]}. +{"%VSN%", + [{<<".*">>,[{restart_application, runtime_tools}]}], + [{<<".*">>,[{restart_application, runtime_tools}]}] +}. diff --git a/lib/runtime_tools/test/runtime_tools_SUITE.erl b/lib/runtime_tools/test/runtime_tools_SUITE.erl index 62497ab527..48ed810918 100644 --- a/lib/runtime_tools/test/runtime_tools_SUITE.erl +++ b/lib/runtime_tools/test/runtime_tools_SUITE.erl @@ -25,7 +25,7 @@ -export([init_per_testcase/2, end_per_testcase/2]). %% Test cases --export([app_file/1, start_stop_app/1]). +-export([app_file/1, appup_file/1, start_stop_app/1]). %% Default timetrap timeout (set in init_per_testcase) -define(default_timeout, ?t:minutes(1)). @@ -43,6 +43,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> [app_file, + appup_file, start_stop_app]. groups() -> @@ -65,6 +66,9 @@ app_file(_Config) -> ?line ok = ?t:app_test(runtime_tools), ok. +appup_file(_Config) -> + ok = ?t:appup_test(runtime_tools). + start_stop_app(_Config) -> ok = application:start(runtime_tools), Sup = whereis(runtime_tools_sup), |