aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/test/systools_SUITE.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2011-12-21 14:53:48 +0100
committerSiri Hansen <[email protected]>2011-12-21 14:53:48 +0100
commit5acece57ced229dc76ebf3eb7cf7dfec1a24cc19 (patch)
tree8043de4e66b641c593f78219902a0a9a7fc2e6c8 /lib/sasl/test/systools_SUITE.erl
parentecb1632afcce1eb5c7e7887af48f2c14fba5b398 (diff)
parent009bef0359d6426e89878d782346feb31d922ee3 (diff)
downloadotp-5acece57ced229dc76ebf3eb7cf7dfec1a24cc19.tar.gz
otp-5acece57ced229dc76ebf3eb7cf7dfec1a24cc19.tar.bz2
otp-5acece57ced229dc76ebf3eb7cf7dfec1a24cc19.zip
Merge branch 'siri/sasl/require-kernel-start/OTP-9652' into maint
* siri/sasl/require-kernel-start/OTP-9652: Reject systools:make_script if kernel and stdlib are not permanent in .rel
Diffstat (limited to 'lib/sasl/test/systools_SUITE.erl')
-rw-r--r--lib/sasl/test/systools_SUITE.erl13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
index 43366d8917..473da2f727 100644
--- a/lib/sasl/test/systools_SUITE.erl
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -483,9 +483,17 @@ crazy_script(Config) when is_list(Config) ->
ok = file:set_cwd(LatestDir2),
error = systools:make_script(LatestName2),
- {error, _, {missing_mandatory_app,[kernel,stdlib]}} =
+ {error, _, {missing_mandatory_app,kernel}} =
systools:make_script(LatestName2, [silent,{path,P}]),
+ %% Run with .rel file with non-permanent kernel
+ {LatestDir3, LatestName3} = create_script(latest_kernel_start_type, Config),
+ ok = file:set_cwd(LatestDir3),
+
+ error = systools:make_script(LatestName3),
+ {error, _, {mandatory_app,kernel,load}} =
+ systools:make_script(LatestName3, [silent,{path,P}]),
+
ok = file:set_cwd(OldDir),
ok.
@@ -1915,6 +1923,9 @@ create_script(latest_small2,Config) ->
create_script(latest_nokernel,Config) ->
Apps = [{db,"2.1"},{fe,"3.1"}],
do_create_script(latest_nokernel,Config,"4.4",Apps);
+create_script(latest_kernel_start_type,Config) ->
+ Apps = [{kernel,"1.0",load},{db,"2.1"},{fe,"3.1"}],
+ do_create_script(latest_kernel_start_type,Config,"4.4",Apps);
create_script(latest_app_start_type1,Config) ->
Apps = core_apps(current),
do_create_script(latest_app_start_type1,Config,current,Apps);