4 files changed, 31 insertions, 9 deletions

diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index c6cbd1a0ef..036e238c85 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -1949,14 +1949,22 @@ config_change(Conf) when is_list(Conf) ->
     %% Find out application data from boot script
     Boot = filename:join([code:root_dir(), "bin", "start.boot"]),
     {ok, Bin} = file:read_file(Boot),
-    Appls = get_appls(binary_to_term(Bin)),
+    Appls0 = get_appls(binary_to_term(Bin)),
+
+    %% And add app1 in order to test OTP-11864 - included config files
+    %% not read for new (not already loaded) applications
+    Appls = [app1() | Appls0],
 
     %% Simulate contents of "sys.config"
     Config = [{stdlib, [{par1,sys},{par2,sys}]},
 		    "t1",
 		    "t2.config",
 		    filename:join([DataDir, "subdir", "t3"]),
-		    {stdlib, [{par6,sys}]}],
+		    {stdlib, [{par6,sys}]},
+	            "t4.config"],
+
+    %% Check that app1 is not loaded
+    false = lists:keymember(app1,1,application:loaded_applications()),
 
     %% Order application_controller to update configuration
     ok = application_controller:change_application_data(Appls,
@@ -1971,6 +1979,13 @@ config_change(Conf) when is_list(Conf) ->
     {value, {par5,t3}}  = lists:keysearch(par5, 1, Env),
     {value, {par6,sys}} = lists:keysearch(par6, 1, Env),
 
+    %% Check that app1 parameters are correctly set after loading
+    [] = application:get_all_env(app1),
+    application:load(app1()),
+    App1Env = application:get_all_env(app1),
+    {value, {par1,t4}} = lists:keysearch(par1, 1, App1Env),
+    application:unload(app1),
+
     ok = file:set_cwd(CWD).
 
 %% This function is stolen from SASL module release_handler, OTP R10B
@@ -1989,6 +2004,7 @@ get_appls([_ | T], Res) ->
 get_appls([], Res) ->
     Res.
 
+
 persistent_env(suite) ->
     [];
 persistent_env(doc) ->
diff --git a/lib/kernel/test/application_SUITE_data/t4.config b/lib/kernel/test/application_SUITE_data/t4.config
new file mode 100644
index 0000000000..8b2bc52c01
--- /dev/null
+++ b/lib/kernel/test/application_SUITE_data/t4.config
@@ -0,0 +1 @@
+[{app1, [{par1,t4}]}].
\ No newline at end of file
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index 78f5e93fc3..1884e8cf58 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -95,10 +95,10 @@ appup_tests(App,{OkVsns,NokVsns}) ->
     ok.
 
 create_test_vsns(App) ->
-    This = erlang:system_info(otp_release),
-    FirstMajor = previous_major(This),
+    ThisMajor = erlang:system_info(otp_release),
+    FirstMajor = previous_major(ThisMajor),
     SecondMajor = previous_major(FirstMajor),
-    Ok = app_vsn(App,[FirstMajor]),
+    Ok = app_vsn(App,[ThisMajor,FirstMajor]),
     Nok0 = app_vsn(App,[SecondMajor]),
     Nok = case Ok of
 	       [Ok1|_] ->
@@ -109,9 +109,9 @@ create_test_vsns(App) ->
     {Ok,Nok}.
 
 previous_major("17") ->
-    "r16";
-previous_major("r"++Rel) ->
-    "r"++previous_major(Rel);
+    "r16b";
+previous_major("r16b") ->
+    "r15b";
 previous_major(Rel) ->
     integer_to_list(list_to_integer(Rel)-1).
 
diff --git a/lib/kernel/test/sendfile_SUITE.erl b/lib/kernel/test/sendfile_SUITE.erl
index 2c741232c4..123e849ccb 100644
--- a/lib/kernel/test/sendfile_SUITE.erl
+++ b/lib/kernel/test/sendfile_SUITE.erl
@@ -72,7 +72,12 @@ end_per_suite(Config) ->
     file:delete(proplists:get_value(big_file, Config)).
 
 init_per_group(async_threads,Config) ->
-    [{sendfile_opts,[{use_threads,true}]}|Config];
+    case erlang:system_info(thread_pool_size) of
+	0 ->
+	    {skip,"No async threads"};
+	_ ->
+	    [{sendfile_opts,[{use_threads,true}]}|Config]
+    end;
 init_per_group(no_async_threads,Config) ->
     [{sendfile_opts,[{use_threads,false}]}|Config].