diff options
| author | Siri Hansen <[email protected]> | 2011-10-11 10:58:47 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-11-17 16:47:28 +0100 |
| commit | 1dec251ad333045847b75b8ee75d4bff4237108e (patch) | |
| tree | f47bdea7e2e4017f51d38599686879230b6f3960 /lib/sasl/test | |
| parent | 8a013f1f16fd4730c24839127afdf46f96a45b0b (diff) | |
| download | otp-1dec251ad333045847b75b8ee75d4bff4237108e.tar.gz otp-1dec251ad333045847b75b8ee75d4bff4237108e.tar.bz2 otp-1dec251ad333045847b75b8ee75d4bff4237108e.zip | |
Upgrade erts: merge sys.config for tmp release instead of using old
The sys.config file used for the temporary release in an erts upgrade
is now a hybrid where kernel, stdlib and sasl configuration is taken
from the new release, and other configuration is taken from the old
release. I.e. similar to how the temporary boot file is created.
Diffstat (limited to 'lib/sasl/test')
| -rw-r--r-- | lib/sasl/test/systools_SUITE.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl index 960ba3cc21..5b3abad219 100644 --- a/lib/sasl/test/systools_SUITE.erl +++ b/lib/sasl/test/systools_SUITE.erl @@ -1486,7 +1486,7 @@ normal_hybrid(Config) -> ?line ok = file:set_cwd(OldDir), ?line BasePaths = {"testkernelpath","teststdlibpath","testsaslpath"}, - ?line {ok,Hybrid} = systools_make:make_boot_hybrid("tmp_vsn",Boot1,Boot2, + ?line {ok,Hybrid} = systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2, BasePaths, [dummy,args]), ?line {script,{"Test release 4","tmp_vsn"},Script} = binary_to_term(Hybrid), @@ -1560,7 +1560,7 @@ normal_hybrid(Config) -> ok. -%% Check that systools_make:make_boot_hybrid fails with a meaningful +%% Check that systools_make:make_hybrid_boot fails with a meaningful %% error message if the FromBoot does not include the sasl %% application. hybrid_no_old_sasl(Config) -> @@ -1584,14 +1584,14 @@ hybrid_no_old_sasl(Config) -> ?line BasePaths = {"testkernelpath","teststdlibpath","testsaslpath"}, ?line {error,{app_not_replaced,sasl}} = - systools_make:make_boot_hybrid("tmp_vsn",Boot1,Boot2, + systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2, BasePaths,[dummy,args]), ?line ok = file:set_cwd(OldDir), ok. -%% Check that systools_make:make_boot_hybrid fails with a meaningful +%% Check that systools_make:make_hybrid_boot fails with a meaningful %% error message if the ToBoot does not include the sasl %% application. hybrid_no_new_sasl(Config) -> @@ -1615,7 +1615,7 @@ hybrid_no_new_sasl(Config) -> ?line BasePaths = {"testkernelpath","teststdlibpath","testsaslpath"}, ?line {error,{app_not_found,sasl}} = - systools_make:make_boot_hybrid("tmp_vsn",Boot1,Boot2, + systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2, BasePaths,[dummy,args]), ?line ok = file:set_cwd(OldDir), |