diff options
| author | Siri Hansen <[email protected]> | 2015-02-18 12:31:31 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2015-02-18 12:31:31 +0100 |
| commit | 2f0b4e88c1d91ee4c722b8e20e50a7170646fc33 (patch) | |
| tree | 5eb4c95a6c7aba7e0d493b189190c30c7e3d64fc /lib/sasl/test/release_handler_SUITE.erl | |
| parent | da70ee77dc1c1716e48814e2d670cbaf0cf06c30 (diff) | |
| parent | fa020e2c9e39bcefea13b24a1b5100ae670506f8 (diff) | |
| download | otp-2f0b4e88c1d91ee4c722b8e20e50a7170646fc33.tar.gz otp-2f0b4e88c1d91ee4c722b8e20e50a7170646fc33.tar.bz2 otp-2f0b4e88c1d91ee4c722b8e20e50a7170646fc33.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[sasl] Make test unreliable of kernel.appup
Diffstat (limited to 'lib/sasl/test/release_handler_SUITE.erl')
| -rw-r--r-- | lib/sasl/test/release_handler_SUITE.erl | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl index bd7414fbb4..b7c5f34f58 100644 --- a/lib/sasl/test/release_handler_SUITE.erl +++ b/lib/sasl/test/release_handler_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2011-2014. All Rights Reserved. +%% Copyright Ericsson AB 2011-2015. 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 @@ -1802,11 +1802,17 @@ upgrade_gg(cleanup,Config) -> %%%----------------------------------------------------------------- %%% OTP-10463, Bug - release_handler could not handle regexp in appup %%% files. -otp_10463_upgrade_script_regexp(_Config) -> - %% Assuming that kernel always has a regexp in it's appup - KernelVsn = vsn(kernel,current), - {ok,KernelVsn,_} = - release_handler:upgrade_script(kernel,code:lib_dir(kernel)), +otp_10463_upgrade_script_regexp(Config) -> + DataDir = ?config(data_dir,Config), + code:add_path(filename:join([DataDir,regexp_appup,app1,ebin])), + application:start(app1), + {ok,"1.1",_} = release_handler:upgrade_script(app1,code:lib_dir(app1)), + ok. + +otp_10463_upgrade_script_regexp(cleanup,Config) -> + DataDir = ?config(data_dir,Config), + application:stop(app1), + code:del_path(filename:join([DataDir,regexp_appup,app1,ebin])), ok. no_dot_erlang(Conf) -> |