Check for sasl application in systools:make_script and make_relup

make_script will give warning but allow it
make_relup will fail since it is not possible to upgrade if sasl is
not included in both releases.

5 files changed, 250 insertions, 336 deletions

diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 33bd51ecbb..ce37f3c2ce 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -364,13 +364,13 @@ get_release(File, Path, ModTestP, Machine) ->
     end.
 	
 get_release1(File, Path, ModTestP, Machine) ->
-    {ok, Release} = read_release(File, Path),
+    {ok, Release, Warnings1} = read_release(File, Path),
     {ok, Appls0} = collect_applications(Release, Path),
     {ok, Appls1} = check_applications(Appls0),
     {ok, Appls2} = sort_included_applications(Appls1, Release), % OTP-4121
-    {ok, Warnings} = check_modules(Appls2, Path, ModTestP, Machine),
+    {ok, Warnings2} = check_modules(Appls2, Path, ModTestP, Machine),
     {ok, Appls} = sort_appls(Appls2),
-    {ok, Release, Appls, Warnings}.
+    {ok, Release, Appls, Warnings1 ++ Warnings2}.
 
 %%______________________________________________________________________
 %% read_release(File, Path) -> {ok, #release} | throw({error, What})
@@ -385,11 +385,12 @@ read_release(File, Path) ->
 
 check_rel(Release) ->
     case catch check_rel1(Release) of
-	{ok, {Name,Vsn,Evsn,Appl,Incl}} ->
+	{ok, {Name,Vsn,Evsn,Appl,Incl}, Ws} ->
 	    {ok, #release{name=Name, vsn=Vsn,
 			  erts_vsn=Evsn,
 			  applications=Appl,
-			  incl_apps=Incl}};
+			  incl_apps=Incl},
+	    Ws};
 	{error, Error} ->
 	    throw({error,?MODULE,Error});
 	Error ->
@@ -400,8 +401,8 @@ check_rel1({release,{Name,Vsn},{erts,EVsn},Appl}) when is_list(Appl) ->
     check_name(Name),
     check_vsn(Vsn),
     check_evsn(EVsn),
-    {Appls,Incls} = check_appl(Appl),
-    {ok, {Name,Vsn,EVsn,Appls,Incls}};
+    {{Appls,Incls},Ws} = check_appl(Appl),
+    {ok, {Name,Vsn,EVsn,Appls,Incls},Ws};
 check_rel1(_) ->
     {error, badly_formatted_release}.
 
@@ -454,8 +455,8 @@ check_appl(Appl) ->
 		end,
 		Appl) of
 	[] ->
-	    mandatory_applications(Appl),
-	    split_app_incl(Appl);
+	    {ok,Ws} = mandatory_applications(Appl),
+	    {split_app_incl(Appl),Ws};
 	Illegal ->
 	    throw({error, {illegal_applications,Illegal}})
     end.
@@ -466,7 +467,12 @@ mandatory_applications(Appl) ->
     Mand = mandatory_applications(),
     case filter(fun(X) -> member(X, AppNames) end, Mand) of
 	Mand ->
-	    ok;
+	    case member(sasl,AppNames) of
+		true ->
+		    {ok,[]};
+		_ ->
+		    {ok, [{warning,missing_sasl}]}
+	    end;
 	_ ->
 	    throw({error, {missing_mandatory_app, Mand}})
     end.
@@ -2312,5 +2318,9 @@ form_warn(Prefix, {exref_undef, Undef}) ->
 			      [Prefix,M,F,A])
 	end,
     map(F, Undef);
+form_warn(Prefix, missing_sasl) ->
+    io_lib:format("~s: Missing application sasl. "
+		  "Can not upgrade with this release~n",
+		  [Prefix]);
 form_warn(Prefix, What) ->
     io_lib:format("~s ~p~n", [Prefix,What]).
diff --git a/lib/sasl/src/systools_relup.erl b/lib/sasl/src/systools_relup.erl
index 5346538dc8..57e375b03e 100644
--- a/lib/sasl/src/systools_relup.erl
+++ b/lib/sasl/src/systools_relup.erl
@@ -205,7 +205,13 @@ do_mk_relup(TopRelFile, BaseUpRelDcs, BaseDnRelDcs, Path, Opts) ->
 	%% TopRel = #release
 	%% NameVsnApps = [{{Name, Vsn}, #application}]
 	{ok, TopRel, NameVsnApps, Ws0} ->
-	    %%
+	    case lists:member({warning,missing_sasl},Ws0) of
+		true ->
+		    throw({error,?MODULE,{missing_sasl,TopRel}});
+		false ->
+		    ok
+	    end,
+
 	    %% TopApps = [#application]
 	    TopApps = lists:map(fun({_, App}) -> App end, NameVsnApps),
 
@@ -252,7 +258,21 @@ foreach_baserel_up(TopRel, TopApps, [BaseRelDc|BaseRelDcs], Path, Opts,
 	       Ws, Acc) ->
     BaseRelFile = extract_filename(BaseRelDc),
 
-    {ok, BaseRel} = systools_make:read_release(BaseRelFile, Path),
+    {BaseRel, {BaseNameVsns, BaseApps}, Ws0} =
+	case systools_make:get_release(BaseRelFile, Path) of
+	    {ok, BR, NameVsnApps, Warns} ->
+		case lists:member({warning,missing_sasl},Warns) of
+		    true ->
+			throw({error,?MODULE,{missing_sasl,BR}});
+		    false ->
+			%% NameVsnApps = [{{Name,Vsn},#application}]
+			%% Gives two lists - [{Name,Vsn}] and [#application]
+			{BR,lists:unzip(NameVsnApps),Warns}
+		end;
+	    Other1 ->
+		throw(Other1)
+	end,
+
 
     %%
     %% BaseRel = #release
@@ -262,7 +282,7 @@ foreach_baserel_up(TopRel, TopApps, [BaseRelDc|BaseRelDcs], Path, Opts,
     %% application, one for each added applications, and one for
     %% each removed applications.
     %%
-    {RUs1, Ws1} = collect_appup_scripts(up, TopApps, BaseRel, Ws, []),
+    {RUs1, Ws1} = collect_appup_scripts(up, TopApps, BaseRel, Ws0++Ws, []),
 
     {RUs2, Ws2} = create_add_app_scripts(BaseRel, TopRel, RUs1, Ws1),
 
@@ -270,16 +290,6 @@ foreach_baserel_up(TopRel, TopApps, [BaseRelDc|BaseRelDcs], Path, Opts,
 
     {RUs4, Ws4} = check_for_emulator_restart(TopRel, BaseRel, RUs3, Ws3, Opts),
 
-    {BaseNameVsns,BaseApps} =
-	case systools_make:get_release(BaseRelFile, Path) of
-	    {ok, _, NameVsnApps, _Warns} ->
-		%% NameVsnApps = [{{Name,Vsn},#application}]
-		%% Gives two lists - [{Name,Vsn}] and [#application]
-		lists:unzip(NameVsnApps);
-	    Other1 ->
-		throw(Other1)
-	end,
-
     case systools_rc:translate_scripts(up, RUs4, TopApps, BaseApps) of
 	{ok, RUs5} ->
 
@@ -303,41 +313,41 @@ foreach_baserel_dn(TopRel, TopApps, [BaseRelDc|BaseRelDcs], Path, Opts,
 	       Ws, Acc) ->
     BaseRelFile = extract_filename(BaseRelDc),
 
-    {ok, BaseRel} = systools_make:read_release(BaseRelFile, Path),
-
-    %% BaseRel = #release
-
-    %% RUs = (release upgrade scripts)
-    %%
-    {RUs1, Ws1} = collect_appup_scripts(dn, TopApps, BaseRel, Ws, []),
-
-    {BaseApps, Ws2} =
+    {BaseRel, BaseApps, Ws0} =
 	case systools_make:get_release(BaseRelFile, Path) of
 	    %%
 	    %% NameVsnApps = [{{Name, Vsn}, #application}]
-	    {ok, _, NameVsnApps, Warns} ->
-		%%
-		%% NApps = [#application]
-		NApps = lists:map(fun({_,App}) -> App end, NameVsnApps),
-		{NApps, Warns ++ Ws1};
+	    {ok, BR, NameVsnApps, Warns} ->
+		case lists:member({warning,missing_sasl},Warns) of
+		    true ->
+			throw({error,?MODULE,{missing_sasl,BR}});
+		    false ->
+			%% NApps = [#application]
+			NApps = lists:map(fun({_,App}) -> App end, NameVsnApps),
+			{BR, NApps, Warns}
+		end;
 	    Other ->
 		throw(Other)
 	end,
 
-    RUs2 = RUs1,
+    %% BaseRel = #release
 
-    {RUs3, Ws3} = create_add_app_scripts(TopRel, BaseRel, RUs2, Ws2),
+    %% RUs = (release upgrade scripts)
+    %%
+    {RUs1, Ws1} = collect_appup_scripts(dn, TopApps, BaseRel, Ws0++Ws, []),
 
-    {RUs4, Ws4} = create_remove_app_scripts(TopRel, BaseRel, RUs3, Ws3),
+    {RUs2, Ws2} = create_add_app_scripts(TopRel, BaseRel, RUs1, Ws1),
 
-    {RUs5, Ws5} = check_for_emulator_restart(TopRel, BaseRel, RUs4, Ws4, Opts),
+    {RUs3, Ws3} = create_remove_app_scripts(TopRel, BaseRel, RUs2, Ws2),
 
-    case systools_rc:translate_scripts(dn, RUs5, BaseApps, TopApps) of
+    {RUs4, Ws4} = check_for_emulator_restart(TopRel, BaseRel, RUs3, Ws3, Opts),
+
+    case systools_rc:translate_scripts(dn, RUs4, BaseApps, TopApps) of
 	{ok, RUs} ->
 	    VDR = {BaseRel#release.vsn,
 		   extract_description(BaseRelDc), RUs},
 	    foreach_baserel_dn(TopRel, TopApps, BaseRelDcs, Path, 
-			       Opts, Ws5, [VDR| Acc]);
+			       Opts, Ws4, [VDR| Acc]);
 	XXX -> 
 	    throw(XXX)
     end;
@@ -598,7 +608,9 @@ format_error({no_relup, File, App, Vsn}) ->
 		  "in file ~p~n",
 		  [App#application.name, App#application.vsn, 
 		   App#application.name, Vsn, File]);
-
+format_error({missing_sasl,Release}) ->
+    io_lib:format("No sasl application in release ~p, ~p. Can not be upgraded.",
+		  [Release#release.name, Release#release.vsn]);
 format_error(Error) ->
     io:format("~p~n", [Error]).
 
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
index e06a26828c..892c4994e8 100644
--- a/lib/sasl/test/systools_SUITE.erl
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -41,7 +41,7 @@
 -export([all/0,suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 -export([ script_options/1, normal_script/1, no_mod_vsn_script/1,
-	  wildcard_script/1, variable_script/1,
+	  wildcard_script/1, variable_script/1, no_sasl_script/1,
 	  abnormal_script/1, src_tests_script/1, crazy_script/1,
 	  warn_shadow_script/1,
 	  included_script/1, included_override_script/1,
@@ -49,8 +49,9 @@
 -export([ tar_options/1, normal_tar/1, no_mod_vsn_tar/1, variable_tar/1,
 	  src_tests_tar/1, shadow_tar/1, var_tar/1,
 	  exref_tar/1, link_tar/1, otp_9507/1]).
--export([ normal_relup/1, restart_relup/1, abnormal_relup/1, no_appup_relup/1,
-	  bad_appup_relup/1, app_start_type_relup/1, regexp_relup/1, otp_3065/1]).
+-export([ normal_relup/1, restart_relup/1, abnormal_relup/1, no_sasl_relup/1,
+	  no_appup_relup/1, bad_appup_relup/1, app_start_type_relup/1,
+	  regexp_relup/1, otp_3065/1]).
 -export([otp_6226/1]).
 -export([normal_hybrid/1,hybrid_no_old_sasl/1,hybrid_no_new_sasl/1]).
 -export([init_per_suite/1, end_per_suite/1, 
@@ -74,8 +75,8 @@ groups() ->
     [{script, [],
       [script_options, normal_script, no_mod_vsn_script,
        wildcard_script, variable_script, abnormal_script,
-       src_tests_script, crazy_script, warn_shadow_script,
-       included_script, included_override_script,
+       no_sasl_script, src_tests_script, crazy_script,
+       warn_shadow_script, included_script, included_override_script,
        included_fail_script, included_bug_script, exref_script,
        otp_3065]},
      {tar, [],
@@ -83,8 +84,8 @@ groups() ->
        src_tests_tar, shadow_tar, var_tar,
        exref_tar, link_tar, otp_9507]},
      {relup, [],
-      [normal_relup, restart_relup, abnormal_relup, no_appup_relup,
-       bad_appup_relup, app_start_type_relup, regexp_relup
+      [normal_relup, restart_relup, abnormal_relup, no_sasl_relup,
+       no_appup_relup, bad_appup_relup, app_start_type_relup, regexp_relup
       ]},
      {hybrid, [], [normal_hybrid,hybrid_no_old_sasl,hybrid_no_new_sasl]},
      {tickets, [], [otp_6226]}].
@@ -390,6 +391,32 @@ abnormal_script(Config) when is_list(Config) ->
 
 %% make_script
 %%
+no_sasl_script(suite) -> [];
+no_sasl_script(doc) ->
+    ["Create script without sasl appl. Check warning."];
+no_sasl_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest1_no_sasl,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = [fname([DataDir, d_normal, lib])],
+    ?line P = [fname([LibDir, '*', ebin]),
+	       fname([DataDir, lib, kernel, ebin]),
+	       fname([DataDir, lib, stdlib, ebin]),
+	       fname([DataDir, lib, sasl, ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line {ok, _ , [{warning,missing_sasl}]} =
+	systools:make_script(LatestName,[{path, P},silent]),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+
+%% make_script
+%%
 src_tests_script(suite) -> [];
 src_tests_script(doc) ->
     ["Do not check date of object file or that source code can be found."];
@@ -1108,15 +1135,17 @@ otp_9507(Config) when is_list(Config) ->
     RelName = fname([LatestDir,LatestName]),
 
     ?line P1 = ["./ebin",
-	       fname([DataDir, lib, kernel, ebin]),
-	       fname([DataDir, lib, stdlib, ebin])],
+		fname([DataDir, lib, kernel, ebin]),
+		fname([DataDir, lib, stdlib, ebin]),
+		fname([DataDir, lib, sasl, ebin])],
     ?line {ok, _, _} = systools:make_script(RelName, [silent, {path, P1}]),
     ?line ok = systools:make_tar(RelName, [{path, P1}]),
     ?line Content1 = tar_contents(RelName),
 
     ?line P2 = ["ebin",
-	       fname([DataDir, lib, kernel, ebin]),
-	       fname([DataDir, lib, stdlib, ebin])],
+		fname([DataDir, lib, kernel, ebin]),
+		fname([DataDir, lib, stdlib, ebin]),
+		fname([DataDir, lib, sasl, ebin])],
 
     %% Tickets solves the following line - it used to fail with
     %% {function_clause,[{filename,join,[[]]},...}
@@ -1183,7 +1212,7 @@ normal_relup(Config) when is_list(Config) ->
     ?line ok = systools:make_relup(LatestName, [LatestName2], [LatestName1],
 				   [{path, P}]),
     ?line ok = check_relup([{fe, "3.1"}, {db, "2.1"}], [{db, "1.0"}]),
-    ?line {ok, _, _, [{erts_vsn_changed, _}]} =
+    ?line {ok, _, _, [pre_R15_emulator_upgrade,{erts_vsn_changed, _}]} =
 	systools:make_relup(LatestName, [LatestName2], [LatestName1],
 			    [{path, P}, silent]),
     ?line ok = check_relup([{fe, "3.1"}, {db, "2.1"}], [{db, "1.0"}]),
@@ -1345,13 +1374,14 @@ no_appup_relup(Config) when is_list(Config) ->
     ?line {_LatestDir1,LatestName1} = create_script(latest_small1,Config),
 
     ?line DataDir = filename:absname(?copydir),
-    ?line P1 = [fname([DataDir, d_no_appup, lib, 'fe-3.1', ebin]),
-		fname([DataDir, lib, kernel, ebin]),
-		fname([DataDir, lib, stdlib, ebin])],
 
     ?line ok = file:set_cwd(LatestDir),
 
     %% Check that appup might be missing
+    ?line P1 = [fname([DataDir, d_no_appup, lib, 'fe-3.1', ebin]),
+		fname([DataDir, lib, kernel, ebin]),
+		fname([DataDir, lib, stdlib, ebin]),
+		fname([DataDir, lib, sasl, ebin])],
     ?line ok =
 	systools:make_relup(LatestName, [LatestName], [], [{path, P1}]),
     ?line {ok,_, _, []} =
@@ -1359,22 +1389,29 @@ no_appup_relup(Config) when is_list(Config) ->
 			    [silent, {path, P1}]),
 
     %% Check that appup might NOT be missing when we need it
+    ?line P2 = [fname([DataDir, d_no_appup, lib, 'fe-3.1', ebin]),
+		fname([DataDir, d_no_appup, lib, 'fe-2.1', ebin]),
+		fname([DataDir, lib, kernel, ebin]),
+		fname([DataDir, lib, stdlib, ebin]),
+		fname([DataDir, lib, sasl, ebin])],
     ?line error =
-	systools:make_relup(LatestName, [LatestName0], [], [{path, P1}]),
+	systools:make_relup(LatestName, [LatestName0], [], [{path, P2}]),
     ?line {error,_,{file_problem, {_,{error,{open,_,_}}}}} =
 	systools:make_relup(LatestName, [], [LatestName0],
-			    [silent, {path, P1}]),
+			    [silent, {path, P2}]),
 
     %% Check that appups missing vsn traps
-    ?line P2 = [fname([DataDir, d_no_appup, lib, 'fe-2.1', ebin]),
+    ?line P3 = [fname([DataDir, d_no_appup, lib, 'fe-2.1', ebin]),
+		fname([DataDir, d_no_appup, lib, 'fe-500.18.7', ebin]),
 		fname([DataDir, lib, kernel, ebin]),
-		fname([DataDir, lib, stdlib, ebin])],
+		fname([DataDir, lib, stdlib, ebin]),
+		fname([DataDir, lib, sasl, ebin])],
 
     ?line error =
-	systools:make_relup(LatestName0, [LatestName1], [], [{path, P2}]),
+	systools:make_relup(LatestName0, [LatestName1], [], [{path, P3}]),
     ?line {error,_,{no_relup, _, _, _}} =
 	systools:make_relup(LatestName0, [], [LatestName1],
-			    [silent, {path, P2}]),
+			    [silent, {path, P3}]),
 
     ?line ok = file:set_cwd(OldDir),
     ok.
@@ -1392,8 +1429,10 @@ bad_appup_relup(Config) when is_list(Config) ->
 
     ?line DataDir = filename:absname(?copydir),
     ?line N2 = [fname([DataDir, d_bad_appup, lib, 'fe-3.1', ebin]),
+		fname([DataDir, d_bad_appup, lib, 'fe-2.1', ebin]),
 		fname([DataDir, lib, kernel, ebin]),
-		fname([DataDir, lib, stdlib, ebin])],
+		fname([DataDir, lib, stdlib, ebin]),
+		fname([DataDir, lib, sasl, ebin])],
 
     ?line ok = file:set_cwd(LatestDir),
 
@@ -1440,6 +1479,37 @@ abnormal_relup(Config) when is_list(Config) ->
     ok.
 
 
+%% make_relup
+%%
+no_sasl_relup(suite) -> [];
+no_sasl_relup(doc) ->
+    ["Check relup can not be created is sasl is not in rel file"];
+no_sasl_relup(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line {Dir1,Name1} = create_script(latest1_no_sasl,Config),
+    ?line {_Dir2,Name2} = create_script(latest1,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = [fname([DataDir, d_normal, lib])],
+    ?line P = [fname([LibDir, '*', ebin]),
+	       fname([DataDir, lib, kernel, ebin]),
+	       fname([DataDir, lib, stdlib, ebin]),
+	       fname([DataDir, lib, sasl, ebin])],
+
+    ?line ok = file:set_cwd(Dir1),
+
+    ?line error = systools:make_relup(Name2, [Name1], [Name1], [{path, P}]),
+    ?line R1 = systools:make_relup(Name2, [Name1], [Name1],[silent, {path, P}]),
+    ?line {error,systools_relup,{missing_sasl,_}} = R1,
+
+    ?line error = systools:make_relup(Name1, [Name2], [Name2], [{path, P}]),
+    ?line R2 = systools:make_relup(Name1, [Name2], [Name2],[silent, {path, P}]),
+    ?line {error,systools_relup,{missing_sasl,_}} = R2,
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+
 %% Check that application start type is used in relup
 app_start_type_relup(suite) ->
     [];
@@ -1453,29 +1523,31 @@ app_start_type_relup(Config) when is_list(Config) ->
     ?line Release2 = filename:join(Dir2,Name2),
 
     ?line {ok, Release2Relup, systools_relup, []} = systools:make_relup(Release2, [Release1], [Release1], [{outdir, PrivDir}, silent]),
-    ?line {"2", [{"1",[], UpInstructions}], [{"1",[], DownInstructions}]} = Release2Relup,
+    ?line {"LATEST_APP_START_TYPE2",
+	   [{"LATEST_APP_START_TYPE1",[], UpInstructions}],
+	   [{"LATEST_APP_START_TYPE1",[], DownInstructions}]} = Release2Relup,
     %% ?t:format("Up: ~p",[UpInstructions]),
     %% ?t:format("Dn: ~p",[DownInstructions]),
     ?line [{load_object_code, {mnesia, _, _}},
-           {load_object_code, {sasl, _, _}},
+           {load_object_code, {runtime_tools, _, _}},
            {load_object_code, {webtool, _, _}},
            {load_object_code, {snmp, _, _}},
            {load_object_code, {xmerl, _, _}},
            point_of_no_return
            | UpInstructionsT] = UpInstructions,
     ?line true = lists:member({apply,{application,start,[mnesia,permanent]}}, UpInstructionsT),
-    ?line true = lists:member({apply,{application,start,[sasl,transient]}}, UpInstructionsT),
+    ?line true = lists:member({apply,{application,start,[runtime_tools,transient]}}, UpInstructionsT),
     ?line true = lists:member({apply,{application,start,[webtool,temporary]}}, UpInstructionsT),
     ?line true = lists:member({apply,{application,load,[snmp]}}, UpInstructionsT),
     ?line false = lists:any(fun({apply,{application,_,[xmerl|_]}}) -> true; (_) -> false end, UpInstructionsT),
     ?line [point_of_no_return | DownInstructionsT] = DownInstructions,
     ?line true = lists:member({apply,{application,stop,[mnesia]}}, DownInstructionsT),
-    ?line true = lists:member({apply,{application,stop,[sasl]}}, DownInstructionsT),
+    ?line true = lists:member({apply,{application,stop,[runtime_tools]}}, DownInstructionsT),
     ?line true = lists:member({apply,{application,stop,[webtool]}}, DownInstructionsT),
     ?line true = lists:member({apply,{application,stop,[snmp]}}, DownInstructionsT),
     ?line true = lists:member({apply,{application,stop,[xmerl]}}, DownInstructionsT),
     ?line true = lists:member({apply,{application,unload,[mnesia]}}, DownInstructionsT),
-    ?line true = lists:member({apply,{application,unload,[sasl]}}, DownInstructionsT),
+    ?line true = lists:member({apply,{application,unload,[runtime_tools]}}, DownInstructionsT),
     ?line true = lists:member({apply,{application,unload,[webtool]}}, DownInstructionsT),
     ?line true = lists:member({apply,{application,unload,[snmp]}}, DownInstructionsT),
     ?line true = lists:member({apply,{application,unload,[xmerl]}}, DownInstructionsT),
@@ -1493,7 +1565,8 @@ regexp_relup(Config) ->
     ?line DataDir = filename:absname(?copydir),
     ?line P = [fname([DataDir, d_regexp_appup, lib, '*', ebin]),
 	       fname([DataDir, lib, kernel, ebin]),
-	       fname([DataDir, lib, stdlib, ebin])],
+	       fname([DataDir, lib, stdlib, ebin]),
+	       fname([DataDir, lib, sasl, ebin])],
 
     ?line ok = file:set_cwd(LatestDir),
 
@@ -1551,7 +1624,7 @@ normal_hybrid(Config) ->
     ?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),
+    ?line {script,{"Test release","tmp_vsn"},Script} = binary_to_term(Hybrid),
     ct:log("~p.~n",[Script]),
 
     %% Check that all paths to base apps are replaced by paths from BaseLib
@@ -1639,7 +1712,8 @@ hybrid_no_old_sasl(Config) ->
 
     ?line ok = file:set_cwd(Dir1),
 
-    ?line {ok, _ , []} = systools:make_script(Name1,[{path, P},silent]),
+    ?line {ok, _ , [{warning,missing_sasl}]} =
+	systools:make_script(Name1,[{path, P},silent]),
     ?line {ok, _ , []} = systools:make_script(Name2,[{path, P},silent]),
     ?line {ok,Boot1} = file:read_file(Name1 ++ ".boot"),
     ?line {ok,Boot2} = file:read_file(Name2 ++ ".boot"),
@@ -1671,7 +1745,8 @@ hybrid_no_new_sasl(Config) ->
     ?line ok = file:set_cwd(Dir1),
 
     ?line {ok, _ , []} = systools:make_script(Name1,[{path, P},silent]),
-    ?line {ok, _ , []} = systools:make_script(Name2,[{path, P},silent]),
+    ?line {ok, _ , [{warning,missing_sasl}]} =
+	systools:make_script(Name2,[{path, P},silent]),
     ?line {ok,Boot1} = file:read_file(Name1 ++ ".boot"),
     ?line {ok,Boot2} = file:read_file(Name2 ++ ".boot"),
 
@@ -1971,291 +2046,94 @@ tar_name(Name) ->
     Name ++ ".tar.gz".
 
 create_script(latest,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, latest),
-    ?line Apps = application_controller:which_applications(),
-    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
-    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line io:format(Fd,
-		    "{release, {\"Test release 3\", \"LATEST\"}, \n"
-		    " {erts, \"4.4\"}, \n"
-		    " [{kernel, \"~s\"}, {stdlib, \"~s\"}, \n"
-		    "  {db, \"2.1\"}, {fe, \"3.1\"}]}.\n",
-		    [KernelVer,StdlibVer]),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps(current) ++ [{db,"2.1"},{fe,"3.1"}],
+    do_create_script(latest,Config,"4.4",Apps);
 create_script(latest_no_mod_vsn,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, latest),
-    ?line Apps = application_controller:which_applications(),
-    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
-    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line io:format(Fd,
-		    "{release, {\"Test release 3\", \"LATESTNOMOD\"}, \n"
-		    " {erts, \"4.4\"}, \n"
-		    " [{kernel, \"~s\"}, {stdlib, \"~s\"}, \n"
-		    "  {db, \"3.1\"}, {fe, \"3.1\"}]}.\n",
-		    [KernelVer,StdlibVer]),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps(current) ++ [{db,"3.1"},{fe,"3.1"}],
+    do_create_script(latest_no_mod_vsn,Config,"4.4",Apps);
 create_script(latest0,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, latest0),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line RelfileContent =
-	{release,{"Test release 2", "LATEST0"},
-	 {erts,"4.4"},
-	 [{kernel,"1.0"},
-	  {stdlib,"1.0"},
-	  {sasl,"1.0"},
-	  {db,"2.1"},
-	  {fe,"3.1"}]},
-    ?line io:format(Fd,"~p.~n",[RelfileContent]),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps("1.0") ++ [{db,"2.1"},{fe,"3.1"}],
+    do_create_script(latest0,Config,"4.4",Apps);
 create_script(latest0_current_erts,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, latest0_current_erts),
-    ?line ErtsVer = erlang:system_info(version),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line RelfileContent =
-	{release,{"Test release 2", "LATEST0_CURRENT_ERTS"},
-	 {erts,ErtsVer},
-	 [{kernel,"1.0"}, % fake - will never happen for real that
-	  {stdlib,"1.0"}, % erts changes verson but not kernel, stdlib, sasl
-	  {sasl,"1.0"},
-	  {db,"2.1"},
-	  {fe,"3.1"}]},
-    ?line io:format(Fd,"~p.~n",[RelfileContent]),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps("1.0") ++ [{db,"2.1"},{fe,"3.1"}],
+    do_create_script(latest0_current_erts,Config,current,Apps);
 create_script(latest1,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, latest1),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line RelfileContent =
-	{release,{"Test release 2", "LATEST1"},
-	 {erts,"4.4"},
-	 [{kernel,"1.0"},
-	  {stdlib,"1.0"},
-	  {sasl,"1.0"},
-	  {db,"1.0"},
-	  {fe,"3.1"}]},
-    ?line io:format(Fd,"~p.~n",[RelfileContent]),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps("1.0") ++ [{db,"1.0"},{fe,"3.1"}],
+    do_create_script(latest1,Config,"4.4",Apps);
 create_script(latest1_no_sasl,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, latest1_no_sasl),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line RelfileContent =
-	{release,{"Test release 2", "LATEST1_NO_SASL"},
-	 {erts,"4.4"},
-	 [{kernel,"1.0"},
-	  {stdlib,"1.0"},
-	  {db,"1.0"},
-	  {fe,"3.1"}]},
-    ?line io:format(Fd,"~p.~n",[RelfileContent]),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = [{kernel,"1.0"},{stdlib,"1.0"},{db,"1.0"},{fe,"3.1"}],
+    do_create_script(latest1_no_sasl,Config,"4.4",Apps);
 create_script(latest2,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, latest2),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line io:format(Fd,
-		    "{release, {\"Test release 1\", \"LATEST2\"}, \n"
-		    " {erts, \"4.3\"}, \n"
-		    " [{kernel, \"1.0\"}, {stdlib, \"1.0\"}, \n"
-		    "  {db, \"1.0\"}, {fe, \"2.1\"}]}.\n",
-		    []),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps("1.0") ++ [{db,"1.0"},{fe,"2.1"}],
+    do_create_script(latest2,Config,"4.3",Apps);
 create_script(latest_small,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, 'latest-small'),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line io:format(Fd,
-		    "{release, {\"Test release 2\", \"LATEST_SMALL\"}, \n"
-		    " {erts, \"4.4\"}, \n"
-		    " [{kernel, \"1.0\"}, {stdlib, \"1.0\"}, \n"
-		    "  {fe, \"3.1\"}]}.\n",
-		    []),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps("1.0") ++ [{fe,"3.1"}],
+    do_create_script(latest_small,Config,"4.4",Apps);
 create_script(latest_small0,Config) ->		%Differs in fe vsn
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, 'latest-small0'),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line io:format(Fd,
-		    "{release, {\"Test release 2\", \"LATEST_SMALL0\"}, \n"
-		    " {erts, \"4.4\"}, \n"
-		    " [{kernel, \"1.0\"}, {stdlib, \"1.0\"}, \n"
-		    "  {fe, \"2.1\"}]}.\n",
-		    []),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps("1.0") ++ [{fe,"2.1"}],
+    do_create_script(latest_small0,Config,"4.4",Apps);
 create_script(latest_small1,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, 'latest-small1'),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line io:format(Fd,
-		    "{release, {\"Test release 2\", \"LATEST_SMALL1\"}, \n"
-		    " {erts, \"4.4\"}, \n"
-		    " [{kernel, \"1.0\"}, {stdlib, \"1.0\"}, \n"
-		    "  {fe, \"500.18.7\"}]}.\n",
-		    []),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps("1.0") ++ [{fe,"500.18.7"}],
+    do_create_script(latest_small1,Config,"4.4",Apps);
 create_script(latest_small2,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, 'latest-small2'),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line io:format(Fd,
-		    "{release, {\"Test release 2\", \"LATEST_SMALL2\"}, \n"
-		    " {erts, \"4.4\"}, \n"
-		    " [{kernel, \"1.0\"}, {stdlib, \"1.0\"}, \n"
-		    "  {fe, \"2.1.1\"}]}.\n",
-		    []),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps("1.0") ++ [{fe,"2.1.1"}],
+    do_create_script(latest_small2,Config,"4.4",Apps);
 create_script(latest_nokernel,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, 'latest-nokernel'),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line io:format(Fd,
-		    "{release, {\"Test release 3\", \"LATEST_NOKERNEL\"}, \n"
-		    " {erts, \"4.4\"}, \n"
-		    " [{db, \"2.1\"}, {fe, \"3.1\"}]}.\n",
-		    []),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = [{db,"2.1"},{fe,"3.1"}],
+    do_create_script(latest_nokernel,Config,"4.4",Apps);
 create_script(latest_app_start_type1,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, latest_app_start_type1),
-    ?line ErtsVer = erlang:system_info(version),
-    ?line Apps = application_controller:which_applications(),
-    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
-    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line RelfileContent = 
-	{release,{"Test release", "1"},
-	 {erts,ErtsVer},
-	 [{kernel,KernelVer},
-	  {stdlib,StdlibVer}]},
-    ?line io:format(Fd,"~p.~n",[RelfileContent]),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps(current),
+    do_create_script(latest_app_start_type1,Config,current,Apps);
 create_script(latest_app_start_type2,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, latest_app_start_type2),
-    ?line ErtsVer = erlang:system_info(version),
-    ?line Apps = application_controller:which_applications(),
-    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
-    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
-    ?line OtherApps = [{mnesia,permanent},
-		       {sasl,transient},
-		       {webtool,temporary},
-		       {snmp,load},
-		       {xmerl,none}],
-    ?line lists:foreach(fun({App,_}) -> application:load(App) end,
-			OtherApps),
-    ?line Loaded = application:loaded_applications(),
-    ?line OtherAppsRel = 
-	lists:map(fun({App,StartType}) -> 
-			  {_,_,Ver} = lists:keyfind(App,1,Loaded),
-			  {App,Ver,StartType}
-		  end,
-		  OtherApps),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line RelfileContent = 
-	{release,{"Test release", "2"},
-	 {erts,ErtsVer},
-	 [{kernel,KernelVer},
-	  {stdlib,StdlibVer} | OtherAppsRel]},
-    ?line io:format(Fd,"~p.~n",[RelfileContent]),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    OtherApps = [{mnesia,current,permanent},
+		 {runtime_tools,current,transient},
+		 {webtool,current,temporary},
+		 {snmp,current,load},
+		 {xmerl,current,none}],
+    Apps = core_apps(current) ++ OtherApps,
+    do_create_script(latest_app_start_type2,Config,current,Apps);
 create_script(current_all_no_sasl,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, 'current_all_no_sasl'),
-    ?line ErtsVer = erlang:system_info(version),
-    ?line Apps = application_controller:which_applications(),
-    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
-    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line RelfileContent =
-	{release,{"Test release 4", "CURRENT_ALL_NO_SASL"},
-	 {erts,ErtsVer},
-	 [{kernel,KernelVer},
-	  {stdlib,StdlibVer},
-	  {db,"2.1"},
-	  {fe,"3.1"}]},
-    ?line io:format(Fd,"~p.~n",[RelfileContent]),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = [{kernel,current},{stdlib,current},{db,"2.1"},{fe,"3.1"}],
+    do_create_script(current_all_no_sasl,Config,current,Apps);
 create_script(current_all,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, current_all),
-    ?line ErtsVer = erlang:system_info(version),
-    ?line application:load(sasl),
-    ?line Apps = application_controller:loaded_applications(),
-    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
-    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
-    ?line {value,{_,_,SaslVer}} = lists:keysearch(sasl,1,Apps),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line RelfileContent =
-	{release,{"Test release 4", "CURRENT_ALL"},
-	 {erts,ErtsVer},
-	 [{kernel,KernelVer},
-	  {stdlib,StdlibVer},
-	  {sasl,SaslVer},
-	  {db,"2.1"}]},% fe left out here on purpose - for normal_hybrid test
-    ?line io:format(Fd,"~p.~n",[RelfileContent]),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps(current) ++ [{db,"2.1"}],
+    do_create_script(current_all,Config,current,Apps);
 create_script(current_all_future_erts,Config) ->
-    ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, current_all_future_erts),
-    ?line application:load(sasl),
-    ?line Apps = application_controller:loaded_applications(),
-    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
-    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
-    ?line {value,{_,_,SaslVer}} = lists:keysearch(sasl,1,Apps),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
-    ?line RelfileContent =
-	{release,{"Test release 4", "CURRENT_ALL_FUTURE_ERTS"},
-	 {erts,"99.99"},
-	 [{kernel,KernelVer},
-	  {stdlib,StdlibVer},
-	  {sasl,SaslVer},
-	  {db,"2.1"},
-	  {fe,"3.1"}]},
-    ?line io:format(Fd,"~p.~n",[RelfileContent]),
-    ?line ok = file:close(Fd),
-    {filename:dirname(Name), filename:basename(Name)};
+    Apps = core_apps(current) ++ [{db,"2.1"},{fe,"3.1"}],
+    do_create_script(current_all_future_erts,Config,"99.99",Apps);
 create_script(current_all_future_sasl,Config) ->
+    Apps = [{kernel,current},{stdlib,current},{sasl,"9.9"},{db,"2.1"},{fe,"3.1"}],
+    do_create_script(current_all_future_sasl,Config,current,Apps).
+
+
+do_create_script(Id,Config,ErtsVsn,AppVsns) ->
     ?line PrivDir = ?privdir,
-    ?line Name = fname(PrivDir, current_all_future_sasl),
-    ?line ErtsVer = erlang:system_info(version),
-    ?line application:load(sasl),
-    ?line Apps = application_controller:loaded_applications(),
-    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
-    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+    ?line Name = fname(PrivDir, Id),
     ?line {ok,Fd} = file:open(Name++".rel",write),
     ?line RelfileContent =
-	{release,{"Test release 4", "CURRENT_ALL_FUTURE_SASL"},
-	 {erts,ErtsVer},
-	 [{kernel,KernelVer},
-	  {stdlib,StdlibVer},
-	  {sasl,"9.9"},
-	  {db,"2.1"},
-	  {fe,"3.1"}]},
+	{release,{"Test release", string:to_upper(atom_to_list(Id))},
+	 {erts,erts_vsn(ErtsVsn)},
+	 app_vsns(AppVsns)},
     ?line io:format(Fd,"~p.~n",[RelfileContent]),
     ?line ok = file:close(Fd),
     {filename:dirname(Name), filename:basename(Name)}.
 
+core_apps(Vsn) ->
+    [{App,Vsn} || App <- [kernel,stdlib,sasl]].
+
+app_vsns(AppVsns) ->
+    [{App,app_vsn(App,Vsn)} || {App,Vsn} <- AppVsns] ++
+	[{App,app_vsn(App,Vsn),Type} || {App,Vsn,Type} <- AppVsns].
+app_vsn(App,current) ->
+    application:load(App),
+    {ok,Vsn} = application:get_key(App,vsn),
+    Vsn;
+app_vsn(_App,Vsn) ->
+    Vsn.
+
+erts_vsn(current) -> erlang:system_info(version);
+erts_vsn(Vsn) -> Vsn.
+
 
 create_include_files(inc1, Config) ->
     ?line PrivDir = ?privdir,
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app
new file mode 100644
index 0000000000..3cb0b0c2cf
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app
@@ -0,0 +1,7 @@
+{application, fe,
+ [{description, "ERICSSON NR FOR FE"},
+  {vsn, "2.1"},
+  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {registered, []},
+  {applications, []},
+  {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app
new file mode 100644
index 0000000000..3a5c0ddd9b
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app
@@ -0,0 +1,7 @@
+{application, fe,
+ [{description, "ERICSSON NR FOR FE"},
+  {vsn, "500.18.7"},
+  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {registered, []},
+  {applications, []},
+  {mod, {fe1, []}}]}.