Merge branch 'siri/reltool/fresh-up' into maint

OTP-9792
OTP-9794
OTP-9967
OTP-9968
OTP-9980
OTP-9984

* siri/reltool/fresh-up: (27 commits)
  [reltool] Improve title of dependency colum
  [reltool] Update status bar for all config changes and for generate target
  [reltool] Fix GUI problems on Windows
  [reltool] Remove skip statement for test that failed due to stdlib error
  [sasl] Sort applications used by other applications correctly in .script
  [sasl] Doc that included applications in .rel defaults to same as in .app
  [reltool] Fix problems with sorting of applications
  [reltool] Just warn if same module occurs twice in .app file
  [reltool] Always return warnings as flat strings
  [reltool] Fix type spec and doc for app() and mod()
  [reltool] Move tables out of common record
  [reltool] Display warnings continously in GUI
  [reltool] Cleanup test code
  [reltool] Unset ERL_FLAGS when running escript from reltool_server_SUITE
  [reltool] Improve error handling
  [reltool] Fix rollback and undo
  [reltool] Link together escript with inlined application
  [reltool] Fix badmatch when starting GUI
  [reltool] Update state and tables consistently for all types of config changes
  [reltool] Add test cases for handling of escripts
  ...

40 files changed, 2292 insertions, 82 deletions

diff --git a/lib/reltool/test/Makefile b/lib/reltool/test/Makefile
index 767454b66a..d8a7adb837 100644
--- a/lib/reltool/test/Makefile
+++ b/lib/reltool/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2009-2011. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. 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
@@ -28,6 +28,7 @@ MODULES= \
 	reltool_app_SUITE \
 	reltool_wx_SUITE \
 	reltool_server_SUITE \
+	reltool_manual_gui_SUITE \
 	reltool_test_lib
 
 
diff --git a/lib/reltool/test/reltool.spec b/lib/reltool/test/reltool.spec
index 2995720105..2501a7a203 100644
--- a/lib/reltool/test/reltool.spec
+++ b/lib/reltool/test/reltool.spec
@@ -1 +1,2 @@
 {suites,"../reltool_test",all}.
+{skip_suites,"../reltool_test",[reltool_manual_gui_SUITE],"Manual only"}.
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE.erl b/lib/reltool/test/reltool_manual_gui_SUITE.erl
new file mode 100644
index 0000000000..0dcc5cbf15
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE.erl
@@ -0,0 +1,266 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. 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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+
+-module(reltool_manual_gui_SUITE).
+
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_suite/1, end_per_suite/1,
+	 init_per_testcase/2, end_per_testcase/2]).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include("reltool_test_lib.hrl").
+
+%% Initialization functions.
+init_per_suite(Config) ->
+    reltool_test_lib:wx_init_per_suite(Config).
+
+end_per_suite(Config) ->
+    reltool_test_lib:wx_end_per_suite(Config).
+
+init_per_testcase(Func,Config) ->
+    reltool_test_lib:init_per_testcase(Func,Config).
+end_per_testcase(Func,Config) ->
+    reltool_test_lib:end_per_testcase(Func,Config).
+
+%% SUITE specification
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [config, depgraphs].
+
+groups() ->
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%% The test cases
+
+%% Semi-automatic walkthrough of the GUI
+config(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    {ok, SysPid} = ?msym({ok, _}, reltool:start([])),
+    link(SysPid),
+
+    SimpleConfigFile = create_simple_config(PrivDir),
+    WarningConfigFile = create_warning_config(PrivDir,DataDir),
+
+    break("there are no modules in the 'Included' and 'Excluded' columns, "
+	  "and now warnings are displayed",
+	  {"load configuration ~p",[SimpleConfigFile]}),
+    break("kernel, stdlib and sasl are included and all other are excluded",
+	  "undo"),
+    break("we are back to default - no included and no excluded applications",
+	  "undo again"),
+    break("kernel, stdlib and sasl are included and all other are excluded",
+	  {"load configuration ~p",
+	   [WarningConfigFile]}),
+    break("a warning is displayed in the warning list",
+	  "undo"),
+    break("no warning is displayed in the warning list",
+	  "load same configuration again"),
+    break("application a is added in the 'Included' column and "
+	  "one warning is displayed",
+	  "reset configuration"),
+    break("we are back to default - no included and no excluded applications, "
+	  "and no warnings",
+	  "undo"),
+    break("a, kernel, stdlib and sasl are included and all other are excluded. "
+	  "One warning should now exist through the rest of this test case",
+	  "double click the warning"),
+    break("a popup window occurs displaying the warning text",
+	  "close it with the 'Close' button"),
+    break("it disappears",
+	  "open it again"),
+    break("the warning text can be marked, copied and pasted",
+	  "close the popup with the close box on the top frame"),
+    break("it disappears",
+	  "select application a from 'Included' column and click 'cross'-button "
+	  "with to exclude it"),
+    break("application a is moved to 'Excluded' column",
+	  "select application tools from 'Excluded' column and click "
+	  "'tick'-button to include it"),
+    break("application tools is moved to 'Included' column",
+	  "select application runtime_tools from 'Excluded' column and click "
+	  "'tick'-button to include it"),
+    break("application runtime_tools is moved to 'Included' column",
+	  "undo"),
+
+    ExplicitConfig = filename:join(PrivDir,"explicit.config"),
+    break("application runtime_tools is moved back to 'Excluded' column",
+	  {"save configuration as 'explicit' to ~p",[ExplicitConfig]}),
+    ExpectedExplicitConfig =
+	{sys,[{lib_dirs,[filename:join(DataDir,"faulty_app_file")]},
+	      {incl_cond,exclude},
+	      {app,a,[{incl_cond,exclude}]},
+	      {app,kernel,[{incl_cond,include}]},
+	      {app,sasl,[{incl_cond,include}]},
+	      {app,stdlib,[{incl_cond,include}]},
+	      {app,tools,[{incl_cond,include}]}]},
+    check_config(ExpectedExplicitConfig,ExplicitConfig),
+
+    break("The saved configuration file is checked and is ok.\n"
+	  "Now go to the 'Libraries' tab and change the root directory to "
+	  "some invalid directory."),
+    break("an error dialog occurs saying that there is no lib dir",
+	  {"add library directory ~p",
+	   [filename:join(DataDir,"dependencies")]}),
+    break("applications x, y and z are added to the 'Excluded' column in "
+	  "'Applications' tab",
+	  "go to the 'System settings' tab and set application inclusion policy "
+	  "to 'derived'"),
+    break("a is excluded, kernel, stdlib, sasl and tools are included and "
+	  "x, y and z are available in the 'Applications' tab",
+	  "undo"),
+    break("all non included application are moved to the 'Excluded' column "
+	  "and that 'Application inclusion policy' under 'System settings' "
+	  "tab is set back to 'exclude'",
+	  "undo again"),
+    break("applications x, y and z are in the 'Available' column",
+	  "open application x, go to the 'Application settings' tab and set "
+	  "'Application inclusion policy' to 'Use application specific config' "
+	  "and 'include'. Close the window"),
+    break("application x is moved to the 'Included' column and z and y are moved "
+	  "to the 'Derived' column in the system window",
+	  "open application y"),
+    break("modules y1, y2 and y3 are in the 'Derived' column",
+	  "go to 'Application dependencies' tab"),
+    break("application y is used by x, requires kernel and stdlib, and uses z",
+	  "go to 'Module dependencies' tab"),
+    break("y is used by x2 and x3, and uses z1",
+	  "got to 'Application settings' tab and select "
+	  "'Source selection policy' 'Use selected version'"),
+    break("'Directories' frame becomes enabled (clickable)",
+	  "select 'Module inclusion policy' 'Use application specific config' "
+	  "and select 'app file + derived'"),
+    break("module y3 is moved to the 'Available' column in the 'Modules' tab",
+	  "open module y1"),
+    break("module y1 is used by x2 and uses z1",
+	  "go to the 'Code' tab and double click the line with call to z1:f()"),
+    break("new tab is opened with module z1",
+	  "find something"),
+    break("it is found",
+	  "goto some line"),
+    break("the cursor is moved to that line",
+	  "click the 'Back' button"),
+    break("the cursor is moved back to the line of your previous 'find'",
+	  "terminate the application window (but keep the module window)."),
+
+    {ok,ServerPid} = reltool:get_server(SysPid),
+    unlink(SysPid),
+    break("the system window is still alive",
+	  "terminate reltool by hitting 'Ctrl-q' (linux) or clicking the "
+	  "close box on the top fram when system window is active"),
+    false = erlang:is_process_alive(SysPid),
+    false = erlang:is_process_alive(ServerPid),
+
+    break("Check that both module window and system window are terminated"),
+
+    ok.
+
+
+depgraphs(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    SimpleConfigFile = create_simple_config(PrivDir),
+    {ok, SysPid} = ?msym({ok, _}, reltool:start([{config,SimpleConfigFile}])),
+    link(SysPid),
+
+    break("Open the application dependency graph and \n\n"
+	  "*move the complete graph by left clicking somewhere over it and drag\n"
+	  "*move one node left clicking the node and drag\n"
+	  "*lock node to position by holding down shift while releasing\n"
+	  "*select several nodes with ctrl and left mouse button\n"
+	  "*lock/unlock selected nodes with suitable buttons\n"
+	  "*freeze\n"
+	  "*reset\n"
+	  "*left slider: push nodes apart\n"
+	  "*right slider: pull nodes together\n"
+	  "*middle slider: adjust length of links\n"
+	  "*select node and delete\n"),
+    break("Open the module dependency graph and meditate over it... "),
+
+    unlink(SysPid),
+    break("Terminate reltool from the file menu in the system window"),
+    false = erlang:is_process_alive(SysPid),
+
+    break("Check that system window and graphs are terminated"),
+
+    ok.
+
+
+
+
+%%%-----------------------------------------------------------------
+%%% Internal functions
+break(CheckStr,DoStr) when is_list(CheckStr), is_list(DoStr) ->
+    Str = io_lib:format("Check that ~s.~n~nThen ~s.",[CheckStr,DoStr]),
+    break(Str);
+break(Check,Do) ->
+    CheckStr =
+	case Check of
+	    {CheckFormat,CheckArgs} -> io_lib:format(CheckFormat,CheckArgs);
+	    _ -> Check
+	end,
+    DoStr =
+	case Do of
+	    {DoFormat,DoArgs} -> io_lib:format(DoFormat,DoArgs);
+	    _ -> Do
+	end,
+    break(CheckStr,DoStr).
+
+break(Str) ->
+    Count =
+	case get(count) of
+	    undefined -> 1;
+	    C -> C
+	end,
+    put(count,Count+1),
+    test_server:break("Step " ++ integer_to_list(Count) ++ ":\n" ++ Str).
+
+check_config(Expected,File) ->
+    {ok,[Config]} = file:consult(File),
+    ?m(Expected,Config).
+
+create_simple_config(PrivDir) ->
+    SimpleConfigFile = filename:join(PrivDir,"simple.config"),
+    SimpleConfig = {sys,[{incl_cond,exclude},
+			 {app,kernel,[{incl_cond,include}]},
+			 {app,stdlib,[{incl_cond,include}]},
+			 {app,sasl,[{incl_cond,include}]}]},
+    ok=file:write_file(SimpleConfigFile,io_lib:format("~p.~n",[SimpleConfig])),
+    SimpleConfigFile.
+
+create_warning_config(PrivDir,DataDir) ->
+    WarningConfigFile = filename:join(PrivDir,"warning.config"),
+    FaultyAppFileDir = filename:join(DataDir,"faulty_app_file"),
+    WarningConfig = {sys,[{lib_dirs,[FaultyAppFileDir]},
+			  {incl_cond,exclude},
+			  {app,kernel,[{incl_cond,include}]},
+			  {app,sasl,[{incl_cond,include}]},
+			  {app,stdlib,[{incl_cond,include}]},
+			  {app,a,[{incl_cond,include}]}
+			 ]},
+    ok=file:write_file(WarningConfigFile,io_lib:format("~p.~n",[WarningConfig])),
+    WarningConfigFile.
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/Makefile.src b/lib/reltool/test/reltool_manual_gui_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..9a340274ad
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/Makefile.src
@@ -0,0 +1,28 @@
+EFLAGS=+debug_info
+
+DEPENDENCIES= \
+     dependencies/x-1.0/ebin/x1.@EMULATOR@ \
+     dependencies/x-1.0/ebin/x2.@EMULATOR@ \
+     dependencies/x-1.0/ebin/x3.@EMULATOR@ \
+     dependencies/y-1.0/ebin/y1.@EMULATOR@ \
+     dependencies/y-1.0/ebin/y2.@EMULATOR@ \
+     dependencies/y-1.0/ebin/y3.@EMULATOR@ \
+     dependencies/z-1.0/ebin/z1.@EMULATOR@
+
+
+all: $(DEPENDENCIES)
+
+dependencies/x-1.0/ebin/x1.@EMULATOR@: dependencies/x-1.0/src/x1.erl
+	erlc $(EFLAGS) -odependencies/x-1.0/ebin dependencies/x-1.0/src/x1.erl
+dependencies/x-1.0/ebin/x2.@EMULATOR@: dependencies/x-1.0/src/x2.erl
+	erlc $(EFLAGS) -odependencies/x-1.0/ebin dependencies/x-1.0/src/x2.erl
+dependencies/x-1.0/ebin/x3.@EMULATOR@: dependencies/x-1.0/src/x3.erl
+	erlc $(EFLAGS) -odependencies/x-1.0/ebin dependencies/x-1.0/src/x3.erl
+dependencies/y-1.0/ebin/y1.@EMULATOR@: dependencies/y-1.0/src/y1.erl
+	erlc $(EFLAGS) -odependencies/y-1.0/ebin dependencies/y-1.0/src/y1.erl
+dependencies/y-1.0/ebin/y2.@EMULATOR@: dependencies/y-1.0/src/y2.erl
+	erlc $(EFLAGS) -odependencies/y-1.0/ebin dependencies/y-1.0/src/y2.erl
+dependencies/y-1.0/ebin/y3.@EMULATOR@: dependencies/y-1.0/src/y3.erl
+	erlc $(EFLAGS) -odependencies/y-1.0/ebin dependencies/y-1.0/src/y3.erl
+dependencies/z-1.0/ebin/z1.@EMULATOR@: dependencies/z-1.0/src/z1.erl
+	erlc $(EFLAGS) -odependencies/z-1.0/ebin dependencies/z-1.0/src/z1.erl
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/ebin/x.app b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/ebin/x.app
new file mode 100644
index 0000000000..ccaab8a8c7
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/ebin/x.app
@@ -0,0 +1,7 @@
+% -*-erlang-*-
+{application, x,
+ [{description, "Main application in reltool dependency test"},
+  {vsn, "1.0"},
+  {modules, [x1,x2,x3]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x1.erl b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x1.erl
new file mode 100644
index 0000000000..bf1e7f9279
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x1.erl
@@ -0,0 +1,5 @@
+-module(x1).
+-compile(export_all).
+
+f() ->
+    ok.
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x2.erl b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x2.erl
new file mode 100644
index 0000000000..82191ba278
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x2.erl
@@ -0,0 +1,5 @@
+-module(x2).
+-compile(export_all).
+
+f() ->
+    y1:f().
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x3.erl b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x3.erl
new file mode 100644
index 0000000000..618c75c9a7
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x3.erl
@@ -0,0 +1,5 @@
+-module(x3).
+-compile(export_all).
+
+f() ->
+    y2:f().
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/ebin/y.app b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/ebin/y.app
new file mode 100644
index 0000000000..4f9b610b69
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/ebin/y.app
@@ -0,0 +1,7 @@
+% -*-erlang-*-
+{application, y,
+ [{description, "Library application in reltool dependency test"},
+  {vsn, "1.0"},
+  {modules, [y1,y2]}, % y3 is skipped on purpose - to test module inclusion policy
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y1.erl b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y1.erl
new file mode 100644
index 0000000000..dd21b33292
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y1.erl
@@ -0,0 +1,5 @@
+-module(y1).
+-compile(export_all).
+
+f() ->
+    z1:f().
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y2.erl b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y2.erl
new file mode 100644
index 0000000000..bf8ddf6080
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y2.erl
@@ -0,0 +1,5 @@
+-module(y2).
+-compile(export_all).
+
+f() ->
+    ok.
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y3.erl b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y3.erl
new file mode 100644
index 0000000000..915d64d5b9
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y3.erl
@@ -0,0 +1,5 @@
+-module(y3).
+-compile(export_all).
+
+f() ->
+    ok.
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/z-1.0/ebin/z.app b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/z-1.0/ebin/z.app
new file mode 100644
index 0000000000..437a0968e9
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/z-1.0/ebin/z.app
@@ -0,0 +1,7 @@
+% -*-erlang-*-
+{application, z,
+ [{description, "Library application in reltool dependency test"},
+  {vsn, "1.0"},
+  {modules, [z1]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/z-1.0/src/z1.erl b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/z-1.0/src/z1.erl
new file mode 100644
index 0000000000..97ef90b87f
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/z-1.0/src/z1.erl
@@ -0,0 +1,5 @@
+-module(z1).
+-compile(export_all).
+
+f() ->
+    ok.
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/ebin/a.app b/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/ebin/a.app
new file mode 100644
index 0000000000..ea77103598
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/ebin/a.app
@@ -0,0 +1 @@
+faulty app file
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/src/a.erl b/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/src/a.erl
new file mode 100644
index 0000000000..bb500bed69
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/src/a.erl
@@ -0,0 +1,49 @@
+%% ``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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved via the world wide web at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(a).
+
+
+-behaviour(gen_server).
+
+-vsn(1).
+
+%% External exports
+-export([start_link/0, a/0]).
+%% Internal exports
+-export([init/1, handle_call/3, handle_info/2, terminate/2]).
+
+start_link() -> gen_server:start_link({local, aa}, a, [], []).
+
+a() -> gen_server:call(aa, a).
+
+%%-----------------------------------------------------------------
+%% Callback functions from gen_server
+%%-----------------------------------------------------------------
+init([]) ->
+    process_flag(trap_exit, true),
+    {ok, state}.
+
+handle_call(a, _From, State) ->
+    X = application:get_all_env(a),
+    {reply, X, State}.
+
+handle_info(_, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/src/a_sup.erl b/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/src/a_sup.erl
new file mode 100644
index 0000000000..a141c1767b
--- /dev/null
+++ b/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/src/a_sup.erl
@@ -0,0 +1,37 @@
+%% ``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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved via the world wide web at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(a_sup).
+
+
+-behaviour(supervisor).
+
+%% External exports
+-export([start/2]).
+
+%% Internal exports
+-export([init/1]).
+
+start(_, _) ->
+    supervisor:start_link({local, a_sup}, a_sup, []).
+
+init([]) ->
+    SupFlags = {one_for_one, 4, 3600},
+    Config = {a,
+	      {a, start_link, []},
+	      permanent, 2000, worker, [a]},
+    {ok, {SupFlags, [Config]}}.
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index 9ed79e8c95..4e24a2fb55 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -24,6 +24,7 @@
 
 -compile(export_all).
 
+-include_lib("reltool/src/reltool.hrl").
 -include("reltool_test_lib.hrl").
 -include_lib("common_test/include/ct.hrl").
 
@@ -51,10 +52,43 @@ end_per_testcase(Func,Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [start_server, set_config, create_release,
-     create_script, create_target, create_embedded,
-     create_standalone, create_old_target,
-     otp_9135, otp_9229_exclude_app, otp_9229_exclude_mod].
+    [start_server,
+     set_config,
+     get_config,
+     create_release,
+     create_release_sort,
+     create_script,
+     create_script_sort,
+     create_target,
+     create_embedded,
+     create_standalone,
+     create_standalone_beam,
+     create_standalone_app,
+     create_standalone_app_clash,
+     create_multiple_standalone,
+     create_old_target,
+     eval_target_spec,
+     otp_9135,
+     otp_9229_dupl_mod_exclude_app,
+     otp_9229_dupl_mod_exclude_mod,
+     dupl_mod_in_app_file,
+     get_apps,
+     get_mod,
+     get_sys,
+     set_app_and_undo,
+     set_apps_and_undo,
+     set_apps_inlined,
+     set_sys_and_undo,
+     load_config_and_undo,
+     load_config_fail,
+     load_config_escript_path,
+     load_config_same_escript_source,
+     load_config_same_escript_beam,
+     load_config_add_escript,
+     reset_config_and_undo,
+     gen_rel_files,
+     save_config,
+     dependencies].
 
 groups() -> 
     [].
@@ -71,8 +105,6 @@ end_per_group(_GroupName, Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Start a server process and check that it does not crash
 
-start_server(TestInfo) when is_atom(TestInfo) -> 
-    reltool_test_lib:tc_info(TestInfo);
 start_server(_Config) ->
     {ok, Pid} = ?msym({ok, _}, reltool:start_server([])),
     Libs = lists:sort(erl_libs()),
@@ -88,8 +120,6 @@ start_server(_Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Start a server process and check that it does not crash
 
-set_config(TestInfo) when is_atom(TestInfo) -> 
-    reltool_test_lib:tc_info(TestInfo);
 set_config(_Config) ->
     Libs = lists:sort(erl_libs()),
     Default =
@@ -112,10 +142,90 @@ set_config(_Config) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Check that get_config returns the expected derivates and defaults
+%% as specified
+get_config(_Config) ->
+
+    KVsn = latest(kernel),
+    StdVsn = latest(stdlib),
+    SaslVsn = latest(sasl),
+
+    Sys = {sys,[{incl_cond, exclude},
+		{app,kernel,[{incl_cond,include}]},
+		{app,sasl,[{incl_cond,include},{vsn,SaslVsn}]},
+		{app,stdlib,[{incl_cond,include}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+    ?m({ok, Sys}, reltool:get_config(Pid)),
+    ?m({ok, Sys}, reltool:get_config(Pid,false,false)),
+
+    %% Include derived info
+    ?msym({ok,{sys,[{incl_cond, exclude},
+		    {erts,[]},
+		    {app,kernel,[{incl_cond,include},{mod,_,[]}|_]},
+		    {app,sasl,[{incl_cond,include},{vsn,SaslVsn},{mod,_,[]}|_]},
+		    {app,stdlib,[{incl_cond,include},{mod,_,[]}|_]}]}},
+	  reltool:get_config(Pid,false,true)),
+
+    %% Include defaults
+    ?msym({ok,{sys,[{root_dir,_},
+		    {lib_dirs,_},
+		    {mod_cond,all},
+		    {incl_cond,exclude},
+		    {app,kernel,[{incl_cond,include},{vsn,undefined}]},
+		    {app,sasl,[{incl_cond,include},{vsn,SaslVsn}]},
+		    {app,stdlib,[{incl_cond,include},{vsn,undefined}]},
+		    {boot_rel,"start_clean"},
+		    {rel,"start_clean","1.0",[]},
+		    {rel,"start_sasl","1.0",[sasl]},
+		    {emu_name,"beam"},
+		    {relocatable,true},
+		    {profile,development},
+		    {incl_sys_filters,[".*"]},
+		    {excl_sys_filters,[]},
+		    {incl_app_filters,[".*"]},
+		    {excl_app_filters,[]},
+		    {incl_archive_filters,[".*"]},
+		    {excl_archive_filters,["^include$","^priv$"]},
+		    {archive_opts,[]},
+		    {rel_app_type,permanent},
+		    {app_file,keep},
+		    {debug_info,keep}]}},
+	  reltool:get_config(Pid,true,false)),
+
+    %% Include both defaults and derived info
+    ?msym({ok,{sys,[{root_dir,_},
+		    {lib_dirs,_},
+		    {mod_cond,all},
+		    {incl_cond,exclude},
+		    {erts,[]},
+		    {app,kernel,[{incl_cond,include},{vsn,KVsn},{mod,_,[]}|_]},
+		    {app,sasl,[{incl_cond,include},{vsn,SaslVsn},{mod,_,[]}|_]},
+		    {app,stdlib,[{incl_cond,include},{vsn,StdVsn},{mod,_,[]}|_]},
+		    {boot_rel,"start_clean"},
+		    {rel,"start_clean","1.0",[]},
+		    {rel,"start_sasl","1.0",[sasl]},
+		    {emu_name,"beam"},
+		    {relocatable,true},
+		    {profile,development},
+		    {incl_sys_filters,[".*"]},
+		    {excl_sys_filters,[]},
+		    {incl_app_filters,[".*"]},
+		    {excl_app_filters,[]},
+		    {incl_archive_filters,[".*"]},
+		    {excl_archive_filters,["^include$","^priv$"]},
+		    {archive_opts,[]},
+		    {rel_app_type,permanent},
+		    {app_file,keep},
+		    {debug_info,keep}]}},
+	  reltool:get_config(Pid,true,true)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% OTP-9135, test that app_file option can be set to all | keep | strip
 
-otp_9135(TestInfo) when is_atom(TestInfo) -> 
-    reltool_test_lib:tc_info(TestInfo);
 otp_9135(_Config) ->
     Libs = lists:sort(erl_libs()),
     StrippedDefaultSys = 
@@ -145,8 +255,6 @@ otp_9135(_Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Generate releases
 
-create_release(TestInfo) when is_atom(TestInfo) -> 
-    reltool_test_lib:tc_info(TestInfo);
 create_release(_Config) ->
     %% Configure the server
     RelName = "Just testing...",
@@ -170,10 +278,135 @@ create_release(_Config) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Generate releases and make sure order of applications specified in
+%% 'rel' parameter is preserved and that included applications are
+%% started before the including application.
+%% Circular dependencies shall also be detected and cause error.
+
+create_release_sort(_Config) -> {skip, "Two bugs related to sorting"};
+create_release_sort(Config) ->
+    DataDir = ?config(data_dir,Config),
+    %% Configure the server
+    RelName1 = "MnesiaFirst",
+    RelName2 = "SaslFirst",
+    RelName3 = "Include-both",
+    RelName4 = "Include-only-app",
+    RelName5 = "Include-only-rel",
+    RelName6 = "Include-missing-app",
+    RelName7 = "Circular",
+    RelName8 = "Include-both-missing-app",
+    RelName9 = "Include-overwrite",
+    RelName10= "Uses-order-as-rel",
+    RelVsn = "1.0",
+    %% Application z (.app file):
+    %%     includes [tools, mnesia]
+    %%     uses [kernel, stdlib, sasl, inets]
+    Sys =
+        {sys,
+         [
+          {lib_dirs, [filename:join(DataDir,"sort_apps")]},
+          {boot_rel, RelName1},
+          {rel, RelName1, RelVsn, [stdlib, kernel, mnesia, sasl]},
+          {rel, RelName2, RelVsn, [stdlib, kernel, sasl, mnesia]},
+          {rel, RelName3, RelVsn, [stdlib, kernel, {z,[tools]}, tools, mnesia]},
+          {rel, RelName4, RelVsn, [stdlib, kernel, z, mnesia, tools]},
+          {rel, RelName5, RelVsn, [stdlib, kernel, {sasl,[tools]}]},
+          {rel, RelName6, RelVsn, [stdlib, kernel, z]},
+	  {rel, RelName7, RelVsn, [stdlib, kernel, mnesia, y, sasl, x]},
+          {rel, RelName8, RelVsn, [stdlib, kernel, {z,[tools]}]},
+          {rel, RelName9, RelVsn, [stdlib, kernel, {z,[]}]},
+          {rel, RelName10, RelVsn, [stdlib, kernel, {z,[]}, inets, sasl]},
+	  {incl_cond,exclude},
+	  {mod_cond,app},
+	  {app,kernel,[{incl_cond,include}]},
+	  {app,stdlib,[{incl_cond,include}]},
+	  {app,mnesia,[{incl_cond,include}]},
+	  {app,sasl,[{incl_cond,include}]},
+	  {app,inets,[{incl_cond,include}]},
+	  {app,x,[{incl_cond,include}]},
+	  {app,y,[{incl_cond,include}]},
+	  {app,z,[{incl_cond,include}]},
+	  {app,tools,[{mod_cond,app},{incl_cond,include}]}
+         ]},
+    %% Generate release
+
+    ?msym({ok, {release, {RelName1, RelVsn},
+		{erts, _},
+		[{kernel, _},
+		 {stdlib, _},
+		 {mnesia, _},
+		 {sasl, _}]}},
+	  reltool:get_rel([{config, Sys}], RelName1)),
+
+    ?msym({ok, {release, {RelName2, RelVsn},
+		{erts, _},
+		[{kernel, _},
+		 {stdlib, _},
+		 {sasl, _},
+		 {mnesia, _}]}},
+	  reltool:get_rel([{config, Sys}], RelName2)),
+
+    ?msym({ok, {release, {RelName3, RelVsn},
+		{erts, _},
+		[{kernel, _},
+		 {stdlib, _},
+		 {sasl, _},
+		 {inets, _},
+		 {tools, _},
+		 {z, _, [tools]},
+		 {mnesia, _}]}},
+	  reltool:get_rel([{config, Sys}], RelName3)),
+
+    %%! BUG: same as OTP-4121, but for reltool???? Or revert tools and mnesia
+    ?msym({ok, {release, {RelName4, RelVsn},
+		{erts, _},
+		[{kernel, _},
+		 {stdlib, _},
+		 {sasl, _},
+		 {inets, _},
+		 {mnesia, _},
+		 {tools, _},
+		 {z, _}]}},
+	  reltool:get_rel([{config, Sys}], RelName4)),
+
+    ?m({error,"sasl: These applications are used by release "
+	"Include-only-rel but are missing as included_applications "
+	"in the app file: [tools]"},
+       reltool:get_rel([{config, Sys}], RelName5)),
+
+    ?m({error, "Undefined applications: [tools,mnesia]"},
+       reltool:get_rel([{config, Sys}], RelName6)),
+
+    ?m({error,"Circular dependencies: [x,y]"},
+       reltool:get_rel([{config, Sys}], RelName7)),
+
+    ?m({error,"Undefined applications: [tools]"},
+       reltool:get_rel([{config, Sys}], RelName8)),
+
+    ?msym({ok,{release,{RelName9,RelVsn},
+	       {erts,_},
+	       [{kernel,_},
+		{stdlib,_},
+		{sasl, _},
+		{inets, _},
+		{z,_,[]}]}},
+	  reltool:get_rel([{config, Sys}], RelName9)),
+
+    %%! BUG: same as OTP-9984, but for reltool???? Or revert inets and sasl?
+    ?msym({ok,{release,{RelName10,RelVsn},
+	       {erts,_},
+	       [{kernel,_},
+		{stdlib,_},
+		{inets, _},
+		{sasl, _},
+		{z,_,[]}]}},
+	  reltool:get_rel([{config, Sys}], RelName10)),
+
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Generate boot scripts
 
-create_script(TestInfo) when is_atom(TestInfo) -> 
-    reltool_test_lib:tc_info(TestInfo);
 create_script(_Config) ->
     %% Configure the server
     RelName = "Just testing",
@@ -218,10 +451,197 @@ create_script(_Config) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Test creation of .script with different sorting of applications and
+%% included applications.
+%% Test that result is equal to what systools produces
+create_script_sort(Config) ->
+    DataDir = ?config(data_dir,Config),
+    %% Configure the server
+    RelName1 = "MnesiaFirst",
+    RelName2 = "SaslFirst",
+    RelName3 = "Include-both",
+    RelName4 = "Include-only-app",
+    RelName5 = "Include-only-rel",
+    RelName6 = "Include-missing-app",
+    RelName7 = "Circular",
+    RelName8 = "Include-both-missing-app",
+    RelName9 = "Include-overwrite",
+    RelVsn = "1.0",
+    LibDir = filename:join(DataDir,"sort_apps"),
+    Sys =
+        {sys,
+         [
+          {lib_dirs, [LibDir]},
+          {boot_rel, RelName1},
+          {rel, RelName1, RelVsn, [stdlib, kernel, mnesia, sasl]},
+          {rel, RelName2, RelVsn, [stdlib, kernel, sasl, mnesia]},
+          {rel, RelName3, RelVsn, [stdlib, kernel, {z,[tools]}, tools, mnesia]},
+          {rel, RelName4, RelVsn, [stdlib, kernel, z, mnesia, tools]},
+          {rel, RelName5, RelVsn, [stdlib, kernel, {sasl,[tools]}]},
+          {rel, RelName6, RelVsn, [stdlib, kernel, z]},
+	  {rel, RelName7, RelVsn, [stdlib, kernel, mnesia, y, sasl, x]},
+          {rel, RelName8, RelVsn, [stdlib, kernel, {z,[tools]}]},
+          {rel, RelName9, RelVsn, [stdlib, kernel, {z,[]}]},
+	  {incl_cond,exclude},
+	  {mod_cond,app},
+	  {app,kernel,[{incl_cond,include}]},
+	  {app,stdlib,[{incl_cond,include}]},
+	  {app,mnesia,[{incl_cond,include}]},
+	  {app,sasl,[{incl_cond,include}]},
+	  {app,inets,[{incl_cond,include}]},
+	  {app,x,[{incl_cond,include}]},
+	  {app,y,[{incl_cond,include}]},
+	  {app,z,[{incl_cond,include}]},
+	  {app,tools,[{mod_cond,app},{incl_cond,include}]}
+         ]},
+
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+
+    %% Generate release files
+    application:load(sasl),
+    application:load(inets),
+    application:load(mnesia),
+    application:load(tools),
+    {ok,KernelVsn} = application:get_key(kernel,vsn),
+    {ok,StdlibVsn} = application:get_key(stdlib,vsn),
+    {ok,SaslVsn} = application:get_key(sasl,vsn),
+    {ok,InetsVsn} = application:get_key(inets,vsn),
+    {ok,MnesiaVsn} = application:get_key(mnesia,vsn),
+    {ok,ToolsVsn} = application:get_key(tools,vsn),
+    ErtsVsn = erlang:system_info(version),
+
+    Rel1 = {release, {RelName1,RelVsn}, {erts,ErtsVsn},
+	    [{kernel,KernelVsn},
+	     {stdlib,StdlibVsn},
+	     {mnesia,MnesiaVsn},
+	     {sasl,SaslVsn}]},
+    FullName1 = filename:join(?WORK_DIR,RelName1),
+    ?m(ok, file:write_file(FullName1 ++ ".rel", io_lib:format("~p.\n", [Rel1]))),
+    Rel2 = {release, {RelName2,RelVsn}, {erts,ErtsVsn},
+	    [{kernel,KernelVsn},
+	     {stdlib,StdlibVsn},
+	     {sasl,SaslVsn},
+	     {mnesia,MnesiaVsn}]},
+    FullName2 = filename:join(?WORK_DIR,RelName2),
+    ?m(ok, file:write_file(FullName2 ++ ".rel", io_lib:format("~p.\n", [Rel2]))),
+    Rel3 = {release, {RelName3,RelVsn}, {erts,ErtsVsn},
+	     [{kernel,KernelVsn},
+	      {stdlib,StdlibVsn},
+	      {z,"1.0",[tools]},
+	      {tools,ToolsVsn},
+	      {mnesia,MnesiaVsn},
+	      {sasl,SaslVsn},
+	      {inets,InetsVsn}]},
+    FullName3 = filename:join(?WORK_DIR,RelName3),
+    ?m(ok, file:write_file(FullName3 ++ ".rel", io_lib:format("~p.\n", [Rel3]))),
+    Rel4 = {release, {RelName4,RelVsn}, {erts,ErtsVsn},
+	     [{kernel,KernelVsn},
+	      {stdlib,StdlibVsn},
+	      {z,"1.0"},
+	      {tools,ToolsVsn},
+	      {mnesia,MnesiaVsn},
+	      {sasl,SaslVsn},
+	      {inets,InetsVsn}]},
+    FullName4 = filename:join(?WORK_DIR,RelName4),
+    ?m(ok, file:write_file(FullName4 ++ ".rel", io_lib:format("~p.\n", [Rel4]))),
+    Rel5 = {release, {RelName5,RelVsn}, {erts,ErtsVsn},
+	     [{kernel,KernelVsn},
+	      {stdlib,StdlibVsn},
+	      {sasl,SaslVsn,[tools]},
+	      {tools,ToolsVsn}]},
+    FullName5 = filename:join(?WORK_DIR,RelName5),
+    ?m(ok, file:write_file(FullName5 ++ ".rel", io_lib:format("~p.\n", [Rel5]))),
+    Rel6 = {release, {RelName6,RelVsn}, {erts,ErtsVsn},
+	     [{kernel,KernelVsn},
+	      {stdlib,StdlibVsn},
+	      {z,"1.0"}]},
+    FullName6 = filename:join(?WORK_DIR,RelName6),
+    ?m(ok, file:write_file(FullName6 ++ ".rel", io_lib:format("~p.\n", [Rel6]))),
+    Rel7 = {release, {RelName7,RelVsn}, {erts,ErtsVsn},
+	     [{kernel,KernelVsn},
+	      {stdlib,StdlibVsn},
+	      {mnesia,MnesiaVsn},
+	      {y,"1.0"},
+	      {sasl,SaslVsn},
+	      {x,"1.0"}]},
+    FullName7 = filename:join(?WORK_DIR,RelName7),
+    ?m(ok, file:write_file(FullName7 ++ ".rel", io_lib:format("~p.\n", [Rel7]))),
+    Rel8 = {release, {RelName8,RelVsn}, {erts,ErtsVsn},
+	     [{kernel,KernelVsn},
+	      {stdlib,StdlibVsn},
+	      {z,"1.0",[tools]}]},
+    FullName8 = filename:join(?WORK_DIR,RelName8),
+    ?m(ok, file:write_file(FullName8 ++ ".rel", io_lib:format("~p.\n", [Rel8]))),
+    Rel9 = {release, {RelName9,RelVsn}, {erts,ErtsVsn},
+	     [{kernel,KernelVsn},
+	      {stdlib,StdlibVsn},
+	      {z,"1.0",[]},
+	      {sasl,SaslVsn},
+	      {inets,InetsVsn}]},
+    FullName9 = filename:join(?WORK_DIR,RelName9),
+    ?m(ok, file:write_file(FullName9 ++ ".rel", io_lib:format("~p.\n", [Rel9]))),
+
+    %% Generate script files with systools and reltool and compare
+    ZPath = filename:join([LibDir,"*",ebin]),
+
+    ?msym({ok,_,_}, systools_make_script(FullName1,ZPath)),
+    {ok, [SystoolsScript1]} = ?msym({ok,[_]}, file:consult(FullName1++".script")),
+    {ok, Script1} = ?msym({ok, _}, reltool:get_script(Pid, RelName1)),
+    ?m(equal, diff_script(SystoolsScript1, Script1)),
+
+    ?msym({ok,_,_}, systools_make_script(FullName2,ZPath)),
+    {ok, [SystoolsScript2]} = ?msym({ok,[_]}, file:consult(FullName2++".script")),
+    {ok, Script2} = ?msym({ok, _}, reltool:get_script(Pid, RelName2)),
+    ?m(equal, diff_script(SystoolsScript2, Script2)),
+
+    ?msym({ok,_,_}, systools_make_script(FullName3,ZPath)),
+    {ok, [SystoolsScript3]} = ?msym({ok,[_]}, file:consult(FullName3++".script")),
+    {ok, Script3} = ?msym({ok, _}, reltool:get_script(Pid, RelName3)),
+    ?m(equal, diff_script(SystoolsScript3, Script3)),
+
+    ?msym({ok,_,_}, systools_make_script(FullName4,ZPath)),
+    {ok, [SystoolsScript4]} = ?msym({ok,[_]}, file:consult(FullName4++".script")),
+    {ok, Script4} = ?msym({ok, _}, reltool:get_script(Pid, RelName4)),
+    ?m(equal, diff_script(SystoolsScript4, Script4)),
+
+    ?msym({error,_,[{error_reading,{sasl,{override_include,_}}}]},
+	  systools_make_script(FullName5,ZPath)),
+    ?m({error,"sasl: These applications are used by release "
+	"Include-only-rel but are missing as included_applications "
+	"in the app file: [tools]"},
+       reltool:get_script(Pid, RelName5)),
+
+    ?msym({error,_,{undefined_applications,_}},
+	  systools_make_script(FullName6,ZPath)),
+    ?m({error, "Undefined applications: [tools,mnesia]"},
+       reltool:get_script(Pid, RelName6)),
+
+    ?msym({error,_,{circular_dependencies,_}},
+	  systools_make_script(FullName7,ZPath)),
+    ?m({error,"Circular dependencies: [x,y]"},
+       reltool:get_script(Pid, RelName7)),
+
+    ?msym({error,_,{undefined_applications,_}},
+	  systools_make_script(FullName8,ZPath)),
+    ?m({error, "Undefined applications: [tools]"},
+       reltool:get_script(Pid, RelName8)),
+
+    ?msym({ok,_,_}, systools_make_script(FullName9,ZPath)),
+    {ok, [SystoolsScript9]} = ?msym({ok,[_]}, file:consult(FullName9++".script")),
+    {ok, Script9} = ?msym({ok, _}, reltool:get_script(Pid, RelName9)),
+    ?m(equal, diff_script(SystoolsScript9, Script9)),
+
+    %% Stop server
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+
+systools_make_script(Name,Path) ->
+    systools:make_script(Name,[{path,[Path]},{outdir,?WORK_DIR},silent]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Generate target system
 
-create_target(TestInfo) when is_atom(TestInfo) -> 
-    reltool_test_lib:tc_info(TestInfo);
 create_target(_Config) ->
     %% Configure the server
     RelName1 = "Just testing",
@@ -243,7 +663,7 @@ create_target(_Config) ->
     ?m(ok, reltool_utils:recursive_delete(TargetDir)),
     ?m(ok, file:make_dir(TargetDir)),
     ?log("SPEC: ~p\n", [reltool:get_target_spec([{config, Config}])]),
-    ?m(ok, reltool:create_target([{config, Config}], TargetDir)),
+    ok = ?m(ok, reltool:create_target([{config, Config}], TargetDir)),
     
     Erl = filename:join([TargetDir, "bin", "erl"]),
     {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl)),
@@ -254,8 +674,6 @@ create_target(_Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Generate embedded target system
 
-create_embedded(TestInfo) when is_atom(TestInfo) -> 
-    reltool_test_lib:tc_info(TestInfo);
 create_embedded(_Config) ->
     %% Configure the server
     RelName1 = "Just testing",
@@ -276,7 +694,7 @@ create_embedded(_Config) ->
     TargetDir = filename:join([?WORK_DIR, "target_embedded"]),
     ?m(ok, reltool_utils:recursive_delete(TargetDir)),
     ?m(ok, file:make_dir(TargetDir)),
-    ?m(ok, reltool:create_target([{config, Config}], TargetDir)),
+    ok = ?m(ok, reltool:create_target([{config, Config}], TargetDir)),
 
     Erl = filename:join([TargetDir, "bin", "erl"]),
     {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl)),
@@ -287,8 +705,6 @@ create_embedded(_Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Generate standalone system
 
-create_standalone(TestInfo) when is_atom(TestInfo) -> 
-    reltool_test_lib:tc_info(TestInfo);
 create_standalone(_Config) ->
     %% Configure the server
     ExDir = code:lib_dir(reltool, examples),
@@ -306,30 +722,223 @@ create_standalone(_Config) ->
     TargetDir = filename:join([?WORK_DIR, "target_standalone"]),
     ?m(ok, reltool_utils:recursive_delete(TargetDir)),
     ?m(ok, file:make_dir(TargetDir)),
-    ?m(ok, reltool:create_target([{config, Config}], TargetDir)),
+    ok = ?m(ok, reltool:create_target([{config, Config}], TargetDir)),
 
+    %% Start the target system and fetch root dir
     BinDir = filename:join([TargetDir, "bin"]),
     Erl = filename:join([BinDir, "erl"]),
     {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl)), 
     RootDir = ?ignore(rpc:call(Node, code, root_dir, [])),
     ?msym(ok, stop_node(Node)),
     
+    %% Execute escript
     Expected =  iolist_to_binary(["Root dir: ", RootDir, "\n"
 				  "Script args: [\"-arg1\",\"arg2\",\"arg3\"]\n",
 				  "Smp: false\n",
 				  "ExitCode:0"]),
     io:format("Expected: ~s\n", [Expected]),
-    ?m(Expected, run(BinDir, EscriptName ++ " -arg1 arg2 arg3")),
+    ?m(Expected, run(BinDir, EscriptName, "-arg1 arg2 arg3")),
     
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Generate standalone system with inlined beam file
+
+create_standalone_beam(Config) ->
+    %% Read beam file
+    DataDir = ?config(data_dir,Config),
+    BeamFile = filename:join([DataDir,escript,"someapp-1.0",ebin,"mymod.beam"]),
+    {ok,BeamBin} = file:read_file(BeamFile),
+
+    %% Create the escript
+    EscriptName = "mymod.escript",
+    Escript = filename:join(?WORK_DIR,EscriptName),
+    ok = escript:create(Escript,[shebang,{beam,BeamBin}]),
+    ok = file:change_mode(Escript,8#00744),
+
+    %% Configure the server
+    Sys =
+        {sys,
+         [
+          {lib_dirs, []},
+          {escript, Escript, [{incl_cond, include}]},
+          {profile, standalone}
+         ]},
+
+    %% Generate target file
+    TargetDir = filename:join([?WORK_DIR, "target_standalone_beam"]),
+    ?m(ok, reltool_utils:recursive_delete(TargetDir)),
+    ?m(ok, file:make_dir(TargetDir)),
+    ok = ?m(ok, reltool:create_target([{config, Sys}], TargetDir)),
+
+    %% Start the target system and fetch root dir
+    BinDir = filename:join([TargetDir, "bin"]),
+    Erl = filename:join([BinDir, "erl"]),
+    {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl)),
+    RootDir = ?ignore(rpc:call(Node, code, root_dir, [])),
+    ?msym(ok, stop_node(Node)),
+
+    %% Execute escript
+    Expected =  iolist_to_binary(["Root dir: ", RootDir, "\n"
+				  "Script args: [\"-arg1\",\"arg2\",\"arg3\"]\n",
+				  "ExitCode:0"]),
+    io:format("Expected: ~s\n", [Expected]),
+    ?m(Expected, run(BinDir, EscriptName, "-arg1 arg2 arg3")),
+
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Generate standalone system with inlined archived application
+
+create_standalone_app(Config) ->
+    %% Create archive
+    DataDir = ?config(data_dir,Config),
+    EscriptDir = filename:join(DataDir,escript),
+    {ok,{_Archive,Bin}} = zip:create("someapp-1.0.ez",["someapp-1.0"],
+				     [memory,
+				      {cwd,EscriptDir},
+				      {compress,all},
+				      {uncompress,[".beam",".app"]}]),
+
+    %% Create the escript
+    EscriptName = "someapp.escript",
+    Escript = filename:join(?WORK_DIR,EscriptName),
+    ok = escript:create(Escript,[shebang,
+				 {emu_args,"-escript main mymod"},
+				 {archive,Bin}]),
+    ok = file:change_mode(Escript,8#00744),
+
+    %% Configure the server
+    Sys =
+        {sys,
+         [
+          {lib_dirs, []},
+          {escript, Escript, [{incl_cond, include}]},
+          {profile, standalone}
+         ]},
+
+    %% Generate target file
+    TargetDir = filename:join([?WORK_DIR, "target_standalone_app"]),
+    ?m(ok, reltool_utils:recursive_delete(TargetDir)),
+    ?m(ok, file:make_dir(TargetDir)),
+    ok = ?m(ok, reltool:create_target([{config, Sys}], TargetDir)),
+
+    %% Start the target system and fetch root dir
+    BinDir = filename:join([TargetDir, "bin"]),
+    Erl = filename:join([BinDir, "erl"]),
+    {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl)),
+    RootDir = ?ignore(rpc:call(Node, code, root_dir, [])),
+    ?msym(ok, stop_node(Node)),
+
+    %% Execute escript
+    Expected =  iolist_to_binary(["Root dir: ", RootDir, "\n"
+				  "Script args: [\"-arg1\",\"arg2\",\"arg3\"]\n",
+				  "ExitCode:0"]),
+    io:format("Expected: ~s\n", [Expected]),
+    ?m(Expected, run(BinDir, EscriptName, "-arg1 arg2 arg3")),
+
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Generate standalone system with inlined archived application
+%% Check that the inlined app can not be explicitly configured
+
+create_standalone_app_clash(Config) ->
+    %% Create archive
+    DataDir = ?config(data_dir,Config),
+    EscriptDir = filename:join(DataDir,escript),
+    {ok,{_Archive,Bin}} = zip:create("someapp-1.0.ez",["someapp-1.0"],
+				     [memory,
+				      {cwd,EscriptDir},
+				      {compress,all},
+				      {uncompress,[".beam",".app"]}]),
+
+    %% Create the escript
+    EscriptName = "someapp.escript",
+    Escript = filename:join(?WORK_DIR,EscriptName),
+    ok = escript:create(Escript,[shebang,
+				 {emu_args,"-escript main mymod"},
+				 {archive,Bin}]),
+    ok = file:change_mode(Escript,8#00744),
+
+    %% Configure the server
+    Sys =
+        {sys,
+         [
+          {lib_dirs, []},
+          {escript, Escript, [{incl_cond, include}]},
+          {profile, standalone},
+	  {app, someapp, [{incl_cond,include}]}
+         ]},
+
+    ?msym({error,"someapp: Application name clash. Escript "++_},
+	  reltool:start_server([{config,Sys}])),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Generate standalone system with multiple escripts
+
+create_multiple_standalone(Config) ->
+    %% First escript
+    ExDir = code:lib_dir(reltool, examples),
+    EscriptName1 = "display_args",
+    Escript1 = filename:join([ExDir, EscriptName1]),
+
+    %% Second escript
+    DataDir = ?config(data_dir,Config),
+    BeamFile = filename:join([DataDir,escript,"someapp-1.0",ebin,"mymod.beam"]),
+    {ok,BeamBin} = file:read_file(BeamFile),
+    EscriptName2 = "mymod.escript",
+    Escript2 = filename:join(?WORK_DIR,EscriptName2),
+    ok = escript:create(Escript2,[shebang,{beam,BeamBin}]),
+    ok = file:change_mode(Escript2,8#00744),
+
+    %% Configure server
+    Sys =
+        {sys,
+         [
+          {lib_dirs, []},
+          {escript, Escript1, [{incl_cond, include}]},
+          {escript, Escript2, [{incl_cond, include}]},
+          {profile, standalone}
+         ]},
+
+    %% Generate target system
+    TargetDir = filename:join([?WORK_DIR, "target_multiple_standalone"]),
+    ?m(ok, reltool_utils:recursive_delete(TargetDir)),
+    ?m(ok, file:make_dir(TargetDir)),
+    ok = ?m(ok, reltool:create_target([{config,Sys}], TargetDir)),
+
+    %% Start the target system and fetch root dir
+    BinDir = filename:join([TargetDir, "bin"]),
+    Erl = filename:join([BinDir, "erl"]),
+    {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl)),
+    RootDir = ?ignore(rpc:call(Node, code, root_dir, [])),
+    ?msym(ok, stop_node(Node)),
+
+    %% Execute escript1
+    Expected1 =  iolist_to_binary(["Root dir: ", RootDir, "\n"
+				  "Script args: [\"-arg1\",\"arg2\",\"arg3\"]\n",
+				  "Smp: false\n",
+				  "ExitCode:0"]),
+    io:format("Expected1: ~s\n", [Expected1]),
+    ?m(Expected1, run(BinDir, EscriptName1, "-arg1 arg2 arg3")),
+
+
+    %% Execute escript2
+    Expected2 =  iolist_to_binary(["Root dir: ", RootDir, "\n"
+				  "Script args: [\"-arg1\",\"arg2\",\"arg3\"]\n",
+				  "ExitCode:0"]),
+    io:format("Expected2: ~s\n", [Expected2]),
+    ?m(Expected2, run(BinDir, EscriptName2, "-arg1 arg2 arg3")),
+
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Generate old type of target system
 
-create_old_target(TestInfo) when is_atom(TestInfo) -> 
-    reltool_test_lib:tc_info(TestInfo);
+create_old_target(_Config) -> {skip, "Old style of target"};
 create_old_target(_Config) ->
-    ?skip("Old style of target", []),
     
     %% Configure the server
     RelName1 = "Just testing",
@@ -350,10 +959,10 @@ create_old_target(_Config) ->
     TargetDir = filename:join([?WORK_DIR, "target_old_style"]),
     ?m(ok, reltool_utils:recursive_delete(TargetDir)),
     ?m(ok, file:make_dir(TargetDir)),
-    ?m(ok, reltool:create_target([{config, Config}], TargetDir)),
+    ok = ?m(ok, reltool:create_target([{config, Config}], TargetDir)),
     
     %% io:format("Will fail on Windows (should patch erl.ini)\n", []),
-    ?m(ok, reltool:install(RelName2, TargetDir)),
+    ok = ?m(ok, reltool:install(RelName2, TargetDir)),
 
     Erl = filename:join([TargetDir, "bin", "erl"]),
     {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl)),
@@ -362,11 +971,43 @@ create_old_target(_Config) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Generate target system with eval_target_spec/3
+
+eval_target_spec(_Config) ->
+    %% Configure the server
+    RelName1 = "Just testing",
+    RelName2 = "Just testing with SASL",
+    RelVsn = "1.0",
+    Config =
+        {sys,
+         [
+          {root_dir, code:root_dir()},
+          {lib_dirs, []},
+          {boot_rel, RelName2},
+          {rel, RelName1, RelVsn, [stdlib, kernel]},
+          {rel, RelName2, RelVsn, [sasl, stdlib, kernel]},
+          {app, sasl, [{incl_cond, include}]}
+         ]},
+
+    %% Generate target file
+    TargetDir = filename:join([?WORK_DIR, "eval_target_spec"]),
+    ?m(ok, reltool_utils:recursive_delete(TargetDir)),
+    ?m(ok, file:make_dir(TargetDir)),
+    {ok, Spec} = ?msym({ok,_}, reltool:get_target_spec([{config, Config}])),
+    ok = ?m(ok, reltool:eval_target_spec(Spec, code:root_dir(), TargetDir)),
+
+    Erl = filename:join([TargetDir, "bin", "erl"]),
+    {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl)),
+    ?msym(ok, stop_node(Node)),
+
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% OTP-9229 - handle duplicated module names, i.e. same module name
 %% exists in two applications.
 
 %% Include on app, exclude the other
-otp_9229_exclude_app(Config) ->
+otp_9229_dupl_mod_exclude_app(Config) ->
     DataDir =  ?config(data_dir,Config),
     LibDir = filename:join(DataDir,"otp_9229"),
 
@@ -389,8 +1030,8 @@ otp_9229_exclude_app(Config) ->
     ?m(ok, reltool_utils:recursive_delete(TargetDir)),
     ?m(ok, file:make_dir(TargetDir)),
     ?log("SPEC: ~p\n", [reltool:get_target_spec([{config, ExclApp}])]),
-    {ok,["Module mylib exists in applications x and y. Using module from application x."]} = reltool:get_status([{config, ExclApp}]),
-    ?m(ok, reltool:create_target([{config, ExclApp}], TargetDir)),
+    ?m({ok,["Module mylib exists in applications x and y. Using module from application x."]}, reltool:get_status([{config, ExclApp}])),
+    ok = ?m(ok, reltool:create_target([{config, ExclApp}], TargetDir)),
 
     Erl = filename:join([TargetDir, "bin", "erl"]),
     {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl)),
@@ -413,7 +1054,7 @@ otp_9229_exclude_app(Config) ->
     ok.
 
 %% Include both apps, but exclude common module from one app
-otp_9229_exclude_mod(Config) ->
+otp_9229_dupl_mod_exclude_mod(Config) ->
     DataDir =  ?config(data_dir,Config),
     LibDir = filename:join(DataDir,"otp_9229"),
 
@@ -436,8 +1077,8 @@ otp_9229_exclude_mod(Config) ->
     ?m(ok, reltool_utils:recursive_delete(TargetDir)),
     ?m(ok, file:make_dir(TargetDir)),
     ?log("SPEC: ~p\n", [reltool:get_target_spec([{config, ExclMod}])]),
-    {ok,["Module mylib exists in applications x and y. Using module from application x."]} = reltool:get_status([{config, ExclMod}]),
-    ?m(ok, reltool:create_target([{config, ExclMod}], TargetDir)),
+    ?m({ok,["Module mylib exists in applications x and y. Using module from application x."]}, reltool:get_status([{config, ExclMod}])),
+    ok = ?m(ok, reltool:create_target([{config, ExclMod}], TargetDir)),
 
     Erl = filename:join([TargetDir, "bin", "erl"]),
     {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl)),
@@ -466,7 +1107,892 @@ otp_9229_exclude_mod(Config) ->
     ok.
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Test that if a module is duplicated in a .app file, then a warning
+%% is produced, but target can still be created.
+dupl_mod_in_app_file(Config) ->
+    DataDir =  ?config(data_dir,Config),
+    LibDir = filename:join(DataDir,"dupl_mod"),
+
+    %% Configure the server
+    Sys =
+        {sys,
+         [
+          {lib_dirs, [LibDir]},
+	  {incl_cond,exclude},
+	  {app,a,[{incl_cond,include}]},
+	  {app,kernel,[{incl_cond,include}]},
+	  {app,stdlib,[{incl_cond,include}]},
+	  {app,sasl,[{incl_cond,include}]}
+         ]},
+
+    %% Generate target file
+    TargetDir = filename:join([?WORK_DIR, "target_dupl_mod_in_app_file"]),
+    ?m(ok, reltool_utils:recursive_delete(TargetDir)),
+    ?m(ok, file:make_dir(TargetDir)),
+    ?log("SPEC: ~p\n", [reltool:get_target_spec([{config, Sys}])]),
+    ?m({ok,["Module a duplicated in app file for application a."]},
+       reltool:get_status([{config, Sys}])),
+
+    %%! test that only one module installed (in spec)
+
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Test the interface used by the GUI:
+%%  get_app
+%%  get_apps
+%%  set_app
+%%  set_apps
+%%  load_config
+%%  reset_config
+%%
+%% Also, for each operation which manipulates the config, test
+%% get_status and undo_config.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+get_apps(_Config) ->
+    Sys = {sys,[{app,kernel,[{incl_cond,include}]},
+		{app,sasl,[{incl_cond,include}]},
+		{app,stdlib,[{incl_cond,include}]},
+		{app,tools,[{incl_cond,derived}]},
+		{app,runtime_tools,[{incl_cond,exclude}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+
+    {ok,Sasl} = ?msym({ok,#app{name=sasl}}, reltool_server:get_app(Pid,sasl)),
+    {ok,[#app{name=kernel},
+	 #app{name=sasl}=Sasl,
+	 #app{name=stdlib}] = White} =
+	?msym({ok,_}, reltool_server:get_apps(Pid,whitelist)),
+    {ok,[#app{name=runtime_tools}] = Black} =
+	?msym({ok,_}, reltool_server:get_apps(Pid,blacklist)),
+
+    {ok,Derived} = ?msym({ok,_}, reltool_server:get_apps(Pid,derived)),
+    true = lists:keymember(tools,#app.name,Derived),
+
+    {ok,Source} = ?msym({ok,_}, reltool_server:get_apps(Pid,source)),
+    true = lists:keymember(common_test,#app.name,Source),
+
+    %% Check that the four lists are disjoint
+    Number = length(White) + length(Black) + length(Derived) + length(Source),
+    WN = lists:usort([N || #app{name=N} <- White]),
+    BN = lists:usort([N || #app{name=N} <- Black]),
+    DN = lists:usort([N || #app{name=N} <- Derived]),
+    SN = lists:usort([N || #app{name=N} <- Source]),
+    AllN = lists:umerge([WN,BN,DN,SN]),
+    ?m(Number,length(AllN)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+get_mod(_Config) ->
+    Sys = {sys,[{app,kernel,[{incl_cond,include}]},
+		{app,sasl,[{incl_cond,include}]},
+		{app,stdlib,[{incl_cond,include}]},
+		{app,tools,[{incl_cond,derived}]},
+		{app,runtime_tools,[{incl_cond,exclude}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+
+    %% Read app and get a module from the #app record
+    {ok,Tools} = ?msym({ok,#app{name=tools}}, reltool_server:get_app(Pid,tools)),
+    Cover = lists:keyfind(cover,#mod.name,Tools#app.mods),
+
+    %% get_mod - and check that it is equal to the one in #app.mods
+    ?m({ok,Cover}, reltool_server:get_mod(Pid,cover)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+get_sys(_Config) ->
+    Sys = {sys,[{app,kernel,[{incl_cond,include}]},
+		{app,sasl,[{incl_cond,include}]},
+		{app,stdlib,[{incl_cond,include}]},
+		{app,tools,[{incl_cond,derived}]},
+		{app,runtime_tools,[{incl_cond,exclude}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+
+    RootDir = code:root_dir(),
+    ?msym({ok,#sys{root_dir=RootDir,apps=undefined}},reltool_server:get_sys(Pid)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+set_app_and_undo(Config) ->
+    Sys = {sys,[{lib_dirs,[filename:join(datadir(Config),"faulty_app_file")]},
+		{incl_cond, exclude},
+		{app,a,[{incl_cond,include}]},
+		{app,kernel,[{incl_cond,include}]},
+		{app,sasl,[{incl_cond,include}]},
+		{app,stdlib,[{incl_cond,include}]},
+		{app,tools,[{incl_cond,include}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+    ?m({ok, Sys}, reltool:get_config(Pid)),
+    ?msym({ok,["a: Cannot parse app file"++_]},reltool_server:get_status(Pid)),
+
+    %% Get app and mod
+    {ok,Tools} = ?msym({ok,_}, reltool_server:get_app(Pid,tools)),
+    {ok,Cover} = ?msym({ok,#mod{name=cover, is_included=true}},
+		       reltool_server:get_mod(Pid,cover)),
+
+    %% Exclude one module with set_app
+    ExclCover = Cover#mod{incl_cond=exclude},
+    Mods = Tools#app.mods,
+    Tools1 = Tools#app{mods = lists:keyreplace(cover,#mod.name,Mods,ExclCover)},
+    {ok,ToolsNoCover,["a: Cannot parse app file"++_|_]} =
+	?msym({ok,_,["a: Cannot parse app file"++_|_]},
+	      reltool_server:set_app(Pid,Tools1)),
+    ?msym({ok,["a: Cannot parse app file"++_]}, reltool_server:get_status(Pid)),
+
+    %% Check that the module is no longer included
+    ?m({ok,ToolsNoCover}, reltool_server:get_app(Pid,tools)),
+    {ok,NoIncludeCover} = ?msym({ok,#mod{name=cover, is_included=false}},
+				reltool_server:get_mod(Pid,cover)),
+
+    %% Undo
+    ?m(ok, reltool_server:undo_config(Pid)),
+    ?m({ok,Tools}, reltool_server:get_app(Pid,tools)),
+    ?m({ok,Cover}, reltool_server:get_mod(Pid,cover)),
+    ?msym({ok,["a: Cannot parse app file"++_]}, reltool_server:get_status(Pid)),
+
+    %% Undo again, to check that it toggles
+    ?msym(ok, reltool_server:undo_config(Pid)),
+    ?m({ok,ToolsNoCover}, reltool_server:get_app(Pid,tools)),
+    ?m({ok,NoIncludeCover}, reltool_server:get_mod(Pid,cover)),
+    ?msym({ok,["a: Cannot parse app file"++_]}, reltool_server:get_status(Pid)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+set_apps_and_undo(Config) ->
+    Sys = {sys,[{lib_dirs,[filename:join(datadir(Config),"faulty_app_file")]},
+		{incl_cond, exclude},
+		{app,kernel,[{incl_cond,include}]},
+		{app,sasl,[{incl_cond,include}]},
+		{app,stdlib,[{incl_cond,include}]},
+		{app,tools,[{incl_cond,include}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+    ?m({ok, Sys}, reltool:get_config(Pid)),
+    ?msym({ok,["a: Cannot parse app file"++_]},reltool_server:get_status(Pid)),
+
+    %% Get app and mod
+    {ok,Tools} = ?msym({ok,_}, reltool_server:get_app(Pid,tools)),
+    ?m(true, Tools#app.is_pre_included),
+    ?m(true, Tools#app.is_included),
+    {ok,Cover} = ?msym({ok,#mod{name=cover, is_included=true}},
+		       reltool_server:get_mod(Pid,cover)),
+
+    %% Exclude one application with set_apps
+    ExclTools = Tools#app{incl_cond=exclude},
+    ?msym({ok,["a: Cannot parse app file"++_]},
+       reltool_server:set_apps(Pid,[ExclTools])),
+    ?msym({ok,["a: Cannot parse app file"++_]}, reltool_server:get_status(Pid)),
+
+    %% Check that the app and its modules (one of them) are no longer included
+    {ok,NoTools} = ?msym({ok,_}, reltool_server:get_app(Pid,tools)),
+    ?m(false, NoTools#app.is_pre_included),
+    ?m(false, NoTools#app.is_included),
+    {ok,NoIncludeCover} = ?msym({ok,#mod{name=cover, is_included=false}},
+				reltool_server:get_mod(Pid,cover)),
+
+    %% Undo
+    ?m(ok, reltool_server:undo_config(Pid)),
+    ?m({ok,Tools}, reltool_server:get_app(Pid,tools)),
+    ?m({ok,Cover}, reltool_server:get_mod(Pid,cover)),
+    ?msym({ok,["a: Cannot parse app file"++_]},reltool_server:get_status(Pid)),
+
+    %% Undo again, to check that it toggles
+    ?m(ok, reltool_server:undo_config(Pid)),
+    ?m({ok,NoTools}, reltool_server:get_app(Pid,tools)),
+    ?m({ok,NoIncludeCover}, reltool_server:get_mod(Pid,cover)),
+    ?msym({ok,["a: Cannot parse app file"++_]}, reltool_server:get_status(Pid)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Test that escript can be configured, but not its inlined applications
+set_apps_inlined(Config) ->
+    %% Create archive
+    DataDir = ?config(data_dir,Config),
+    EscriptDir = filename:join(DataDir,escript),
+    {ok,{_Archive,Bin}} = zip:create("someapp-1.0.ez",["someapp-1.0"],
+				     [memory,
+				      {cwd,EscriptDir},
+				      {compress,all},
+				      {uncompress,[".beam",".app"]}]),
+
+    %% Create the escript
+    EscriptName = "someapp.escript",
+    Escript = filename:join(?WORK_DIR,EscriptName),
+    ok = escript:create(Escript,[shebang,
+				 {emu_args,"-escript main mymod"},
+				 {archive,Bin}]),
+    ok = file:change_mode(Escript,8#00744),
+
+    %% Configure the server
+    Sys = {sys,[{incl_cond, exclude},
+		{escript,Escript,[]},
+		{app,kernel,[{incl_cond,include}]},
+		{app,sasl,[{incl_cond,include}]},
+		{app,stdlib,[{incl_cond,include}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+    ?msym({ok,[]},reltool_server:get_status(Pid)),
+
+    %% Get app and mod
+    {ok,EApp} = ?msym({ok,_}, reltool_server:get_app(Pid,'*escript* someapp')),
+    {ok,Someapp} = ?msym({ok,_}, reltool_server:get_app(Pid,someapp)),
+    ?m(undefined, EApp#app.incl_cond),
+    ?m(undefined, Someapp#app.incl_cond),
+    ?m(false, Someapp#app.is_included),
+    ?m(false, Someapp#app.is_pre_included),
+
+    %% Include escript
+    EApp1 = EApp#app{incl_cond=include},
+    ?m({ok,[]}, reltool_server:set_apps(Pid,[EApp1])),
+    ExpectedEApp = EApp1#app{is_included=true,is_pre_included=true},
+    ?m({ok,ExpectedEApp}, reltool_server:get_app(Pid,'*escript* someapp')),
+    {ok,Someapp1} = ?msym({ok,_}, reltool_server:get_app(Pid,someapp)),
+    ?m(include, Someapp1#app.incl_cond),
+    ?m(true, Someapp1#app.is_included),
+    ?m(true, Someapp1#app.is_pre_included),
+
+    %% Check that inlined app can not be configured
+    Someapp2 = Someapp1#app{incl_cond=exclude},
+    ?msym({error,
+	   "Application someapp is inlined in '*escript* someapp'. "
+	   "Can not change configuration for an inlined application."},
+	  reltool_server:set_apps(Pid,[Someapp2])),
+    ?m({ok,Someapp1}, reltool_server:get_app(Pid,someapp)),
+
+    %% Exclude escript
+    {ok,EApp2} = ?msym({ok,_}, reltool_server:get_app(Pid,'*escript* someapp')),
+    EApp3 = EApp2#app{incl_cond=exclude},
+    ?m({ok,[]}, reltool_server:set_apps(Pid,[EApp3])),
+    ExpectedEApp3 = EApp3#app{is_included=false,is_pre_included=false},
+    ?m({ok,ExpectedEApp3}, reltool_server:get_app(Pid,'*escript* someapp')),
+    {ok,Someapp3} = ?msym({ok,_}, reltool_server:get_app(Pid,someapp)),
+    ?m(exclude, Someapp3#app.incl_cond),
+    ?m(false, Someapp3#app.is_included),
+    ?m(false, Someapp3#app.is_pre_included),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+set_sys_and_undo(Config) ->
+    Sys1 = {sys,[{incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,tools,[{incl_cond,include}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys1}])),
+    ?m({ok,[]}, reltool_server:get_status(Pid)),
+
+    %% Read sys record
+    {ok, SysRec} = reltool_server:get_sys(Pid),
+
+    %% Set lib dirs by call to set_sys
+    NewLib = filename:join(datadir(Config),"faulty_app_file"),
+    NewLibDirs = [NewLib | SysRec#sys.lib_dirs],
+    NewSysRec = SysRec#sys{lib_dirs=NewLibDirs},
+    ?msym({ok,["a: Cannot parse app file"++_]},
+	  reltool_server:set_sys(Pid, NewSysRec)),
+    ?m({ok,NewSysRec}, reltool_server:get_sys(Pid)),
+    ?msym({ok,["a: Cannot parse app file"++_]},reltool_server:get_status(Pid)),
+
+    %% Undo
+    ?m(ok, reltool_server:undo_config(Pid)),
+    ?m({ok,SysRec}, reltool_server:get_sys(Pid)),
+    ?m({ok,[]}, reltool_server:get_status(Pid)),
+
+    %% Undo again, to check that it toggles
+    ?m(ok,reltool_server:undo_config(Pid)),
+    ?m({ok,NewSysRec}, reltool_server:get_sys(Pid)),
+    ?msym({ok,["a: Cannot parse app file"++_]},reltool_server:get_status(Pid)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+load_config_and_undo(Config) ->
+    Sys1 = {sys,[{incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,tools,[{incl_cond,include}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys1}])),
+    ?m({ok, Sys1}, reltool:get_config(Pid)),
+    ?m({ok,[]}, reltool_server:get_status(Pid)),
+
+    %% Get app and mod
+    {ok,Tools1} = ?msym({ok,_}, reltool_server:get_app(Pid,tools)),
+    ?m(true, Tools1#app.is_pre_included),
+    ?m(true, Tools1#app.is_included),
+    {ok,Cover1} = ?msym({ok,#mod{name=cover,
+				 is_included=true,
+				 is_pre_included=true}},
+			reltool_server:get_mod(Pid,cover)),
+
+    %% Change tools from include to derived by loading new config
+    Sys2 = {sys,[{lib_dirs,[filename:join(datadir(Config),"faulty_app_file")]},
+		 {app,a,[{incl_cond,include}]},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,tools,[{incl_cond,derived}]}]},
+    ?msym({ok,["a: Cannot parse app file"++_]},
+	  reltool_server:load_config(Pid,Sys2)),
+%%% OTP-0702, 15)    ?m({ok, Sys2}, reltool:get_config(Pid)),
+%%% Note that {incl_cond,exclude} is removed compared to Sys1 -
+%%% config is merged, not overwritten - is this correct???
+    ?msym({ok,["a: Cannot parse app file"++_]},reltool_server:get_status(Pid)),
+
+    %% Check that tools is included (since it is used by sasl) but not
+    %% pre-included (neither included or excluded => undefined)
+    {ok,Tools2} = ?msym({ok,_}, reltool_server:get_app(Pid,tools)),
+    ?m(undefined, Tools2#app.is_pre_included),
+    ?m(true, Tools2#app.is_included),
+    {ok,Cover2} = ?msym({ok,#mod{name=cover,
+				 is_included=true,
+				 is_pre_included=undefined}},
+			reltool_server:get_mod(Pid,cover)),
+
+    %% Undo
+    ?m(ok, reltool_server:undo_config(Pid)),
+    ?m({ok,Tools1}, reltool_server:get_app(Pid,tools)),
+    ?m({ok,Cover1}, reltool_server:get_mod(Pid,cover)),
+    ?m({ok,[]}, reltool_server:get_status(Pid)),
+
+    %% Undo again, to check that it toggles
+    ?m(ok, reltool_server:undo_config(Pid)),
+    ?m({ok,Tools2}, reltool_server:get_app(Pid,tools)),
+    ?m({ok,Cover2}, reltool_server:get_mod(Pid,cover)),
+    ?msym({ok,["a: Cannot parse app file"++_]},reltool_server:get_status(Pid)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Test that load_config is properly rolled back if it fails
+load_config_fail(_Config) ->
+    Sys1 = {sys,[{incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,tools,[{incl_cond,include}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys1}])),
+    ?m({ok, Sys1}, reltool:get_config(Pid)),
+    ?m({ok,[]}, reltool_server:get_status(Pid)),
+
+    %% Get app and mod
+    {ok,Tools} = ?msym({ok,_}, reltool_server:get_app(Pid,tools)),
+
+    %% Try to load a config with a faulty rel statement (includes a
+    %% non-existing application)
+    Sys2 = {sys,[{incl_cond, exclude},
+		 {boot_rel, "faulty_rel"},
+		 {rel, "faulty_rel", "1.0", [kernel, sasl, stdlib, xxx]},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]}]},
+    ?msym({error,"Release \"faulty_rel\" uses non existing application xxx"},
+	  reltool_server:load_config(Pid,Sys2)),
+
+    %% Check that a rollback is done to the old configuration
+    ?m({ok, Sys1}, reltool:get_config(Pid,false,false)),
+
+    %% and that tools is not changed (i.e. that the new configuration
+    %% is not applied)
+    ?m({ok,Tools}, reltool_server:get_app(Pid,tools)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Load config with escript
+
+load_config_escript_path(Config) ->
+    %% Create escript
+    DataDir = ?config(data_dir,Config),
+    BeamFile = filename:join([DataDir,escript,"someapp-1.0",ebin,"mymod.beam"]),
+    {ok,BeamBin} = file:read_file(BeamFile),
+    EscriptName = "mymod.escript",
+    Escript = filename:join(?WORK_DIR,EscriptName),
+    ok = escript:create(Escript,[shebang,{beam,BeamBin}]),
+    ok = file:change_mode(Escript,8#00744),
+
+    %% Start reltool_server with one escript in configuration
+    EscriptSys =
+        {sys,
+         [
+          {lib_dirs, []},
+          {escript, Escript, [{incl_cond, include}]},
+          {profile, standalone}
+         ]},
+
+    {ok, Pid1} = ?msym({ok, _}, reltool:start_server([{config, EscriptSys}])),
+    {ok,[#app{name='*escript* mymod'}=A]} =
+	?msym({ok,[_]}, reltool_server:get_apps(Pid1,whitelist)),
+    ?m(ok, reltool:stop(Pid1)),
+
+
+    %% Do same again, but now start reltool first with simple config,
+    %% then add escript by loading new configuration and check that
+    %% #app is the same
+    SimpleSys =
+        {sys,
+         [
+          {lib_dirs, []}
+         ]},
 
+    {ok, Pid2} = ?msym({ok, _}, reltool:start_server([{config, SimpleSys}])),
+    ?m({ok,[]}, reltool_server:get_apps(Pid2,whitelist)),
+    ?m({ok,[]}, reltool_server:load_config(Pid2,EscriptSys)),
+    ?m({ok,[A]}, reltool_server:get_apps(Pid2,whitelist)),
+
+    ?m(ok, reltool:stop(Pid2)),
+
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Load config with same (source) escript twice and check that the
+%% application information is not changed.
+
+load_config_same_escript_source(_Config) ->
+    %% Create escript
+    ExDir = code:lib_dir(reltool, examples),
+    EscriptName = "display_args",
+    Escript = filename:join([ExDir, EscriptName]),
+
+    %% Start reltool_server with one escript in configuration
+    Sys =
+        {sys,
+         [
+          {lib_dirs, []},
+          {escript, Escript, [{incl_cond, include}]},
+          {profile, standalone}
+         ]},
+
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+%    {ok,[#app{name='*escript* display_args'}]} =
+    ?msym({ok,[#app{name='*escript* display_args',mods=[_]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+
+    %% Load the same config again, then check that app is not changed
+    ?m({ok,[]}, reltool_server:load_config(Pid,Sys)),
+    ?msym({ok,[#app{name='*escript* display_args',mods=[_]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+
+    ?m(ok, reltool:stop(Pid)),
+
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Load config with same (beam) escript twice and check that the
+%% application information is not changed.
+
+load_config_same_escript_beam(Config) ->
+    %% Create escript
+    DataDir = ?config(data_dir,Config),
+    BeamFile = filename:join([DataDir,escript,"someapp-1.0",ebin,"mymod.beam"]),
+    {ok,BeamBin} = file:read_file(BeamFile),
+    EscriptName = "mymod.escript",
+    Escript = filename:join(?WORK_DIR,EscriptName),
+    ok = escript:create(Escript,[shebang,{beam,BeamBin}]),
+    ok = file:change_mode(Escript,8#00744),
+
+    %% Start reltool_server with one escript in configuration
+    Sys =
+        {sys,
+         [
+          {lib_dirs, []},
+          {escript, Escript, [{incl_cond, include}]},
+          {profile, standalone}
+         ]},
+
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+    {ok,[#app{name='*escript* mymod'}=A]} =
+	?msym({ok,[_]}, reltool_server:get_apps(Pid,whitelist)),
+
+    %% Load the same config again, then check that app is not changed
+    ?m({ok,[]}, reltool_server:load_config(Pid,Sys)),
+    ?m({ok,[A]}, reltool_server:get_apps(Pid,whitelist)),
+
+    ?m(ok, reltool:stop(Pid)),
+
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Load config with escript
+
+load_config_add_escript(Config) ->
+    %% First escript
+    ExDir = code:lib_dir(reltool, examples),
+    EscriptName1 = "display_args",
+    Escript1 = filename:join([ExDir, EscriptName1]),
+
+    %% Second escript
+    DataDir = ?config(data_dir,Config),
+    BeamFile = filename:join([DataDir,escript,"someapp-1.0",ebin,"mymod.beam"]),
+    {ok,BeamBin} = file:read_file(BeamFile),
+    EscriptName2 = "mymod.escript",
+    Escript2 = filename:join(?WORK_DIR,EscriptName2),
+    ok = escript:create(Escript2,[shebang,{beam,BeamBin}]),
+    ok = file:change_mode(Escript2,8#00744),
+
+    %% Start reltool_server with one escript in configuration
+    Sys1 =
+        {sys,
+         [
+          {lib_dirs, []},
+          {escript, Escript2, [{incl_cond, include}]},
+          {profile, standalone}
+         ]},
+
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys1}])),
+
+    %% Add second escript by loading new configuration
+    Sys2 =
+        {sys,
+         [
+          {lib_dirs, []},
+          {escript, Escript1, [{incl_cond, include}]},
+          {escript, Escript2, [{incl_cond, include}]},
+          {profile, standalone}
+         ]},
+
+    {ok,[]} = ?m({ok,[]}, reltool_server:load_config(Pid,Sys2)),
+    {ok,[#app{name='*escript* display_args'},
+	 #app{name='*escript* mymod'}]} =
+	?msym({ok,[_,_]}, reltool_server:get_apps(Pid,whitelist)),
+
+    ?m(ok, reltool:stop(Pid)),
+
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+reset_config_and_undo(Config) ->
+    Sys1 = {sys,[{lib_dirs,[filename:join(datadir(Config),"faulty_app_file")]},
+		 {incl_cond, exclude},
+		 {app,a,[{incl_cond,include}]},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,tools,[{incl_cond,include}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys1}])),
+    ?m({ok, Sys1}, reltool:get_config(Pid)),
+    ?msym({ok,["a: Cannot parse app file"++_]},reltool_server:get_status(Pid)),
+
+    %% Get app and mod
+    {ok,Tools1} = ?msym({ok,_}, reltool_server:get_app(Pid,tools)),
+    ?m(true, Tools1#app.is_pre_included),
+    ?m(true, Tools1#app.is_included),
+    {ok,Cover1} = ?msym({ok,#mod{name=cover,
+				 is_included=true,
+				 is_pre_included=true}},
+			reltool_server:get_mod(Pid,cover)),
+
+    %% Exclude tools by loading new config
+    Sys2 = {sys,[{incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,tools,[{incl_cond,exclude}]}]},
+    ?m({ok,[]}, reltool_server:load_config(Pid,Sys2)),
+    ?m({ok,[]}, reltool_server:get_status(Pid)),
+
+    %% Check that tools is excluded
+    {ok,Tools2} = ?msym({ok,_}, reltool_server:get_app(Pid,tools)),
+    ?m(false, Tools2#app.is_pre_included),
+    ?m(false, Tools2#app.is_included),
+    {ok,Cover2} = ?msym({ok,#mod{name=cover,
+				 is_included=false,
+				 is_pre_included=false}},
+			reltool_server:get_mod(Pid,cover)),
+
+    %% Reset
+    ?msym({ok,["a: Cannot parse app file"++_]},reltool_server:reset_config(Pid)),
+    ?m({ok,Tools1}, reltool_server:get_app(Pid,tools)),
+    ?m({ok,Cover1}, reltool_server:get_mod(Pid,cover)),
+    ?msym({ok,["a: Cannot parse app file"++_]},reltool_server:get_status(Pid)),
+
+    %% Undo
+    ?m(ok, reltool_server:undo_config(Pid)),
+    ?m({ok,Tools2}, reltool_server:get_app(Pid,tools)),
+    ?m({ok,Cover2}, reltool_server:get_mod(Pid,cover)),
+    ?m({ok,[]}, reltool_server:get_status(Pid)),
+
+    %% Undo again, to check that it toggles
+    ?m(ok, reltool_server:undo_config(Pid)),
+    ?m({ok,Tools1}, reltool_server:get_app(Pid,tools)),
+    ?m({ok,Cover1}, reltool_server:get_mod(Pid,cover)),
+    ?msym({ok,["a: Cannot parse app file"++_]},reltool_server:get_status(Pid)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+gen_rel_files(_Config) ->
+    %% Configure the server
+    RelName = "gen_fel_files_test",
+    RelVsn = "1.0",
+    Sys =
+        {sys,
+         [
+          {lib_dirs, []},
+          {boot_rel, RelName},
+          {rel, RelName, RelVsn, [kernel, stdlib]}
+         ]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+
+    %% Generate .rel, .script and .boot
+    Dir = filename:join(?WORK_DIR,"gen_rel_files"),
+    ok = file:make_dir(Dir),
+    ?m({ok,[]}, reltool_server:gen_rel_files(Pid,Dir)),
+
+    Script = RelName ++ ".script",
+    Rel = RelName ++ ".rel",
+    Boot = RelName ++ ".boot",
+    {ok,Files} = ?msym({ok,_}, file:list_dir(Dir)),
+    [Boot,Rel,Script] = lists:sort(Files),
+
+    %% Check that contents is reasonable
+    {ok,[S]} = ?msym({ok,[{script,_,_}]},file:consult(filename:join(Dir,Script))),
+    ?msym({ok,[{release,_,_,_}]}, file:consult(filename:join(Dir,Rel))),
+    {ok,Bin} = ?msym({ok,_}, file:read_file(filename:join(Dir,Boot))),
+    ?m(S,binary_to_term(Bin)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+save_config(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    Sys = {sys,[{incl_cond, exclude},
+		{app,kernel,[{incl_cond,include}]},
+		{app,sasl,[{incl_cond,include}]},
+		{app,stdlib,[{incl_cond,include}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+    ?m({ok, Sys}, reltool:get_config(Pid)),
+
+    Simple = filename:join(PrivDir,"save_simple.reltool"),
+    ?m(ok, reltool_server:save_config(Pid,Simple,false,false)),
+    ?m({ok,[Sys]}, file:consult(Simple)),
+
+    Derivates = filename:join(PrivDir,"save_derivates.reltool"),
+    ?m(ok, reltool_server:save_config(Pid,Derivates,false,true)),
+    ?msym({ok,[{sys,[{incl_cond, exclude},
+		     {erts,[]},
+		     {app,kernel,[{incl_cond,include},{mod,_,[]}|_]},
+		     {app,sasl,[{incl_cond,include},{mod,_,[]}|_]},
+		     {app,stdlib,[{incl_cond,include},{mod,_,[]}|_]}]}]},
+	  file:consult(Derivates)),
+
+    Defaults = filename:join(PrivDir,"save_defaults.reltool"),
+    ?m(ok, reltool_server:save_config(Pid,Defaults,true,false)),
+    ?msym({ok,[{sys,[{root_dir,_},
+		     {lib_dirs,_},
+		     {mod_cond,all},
+		     {incl_cond,exclude},
+		     {app,kernel,[{incl_cond,include},{vsn,undefined}]},
+		     {app,sasl,[{incl_cond,include},{vsn,undefined}]},
+		     {app,stdlib,[{incl_cond,include},{vsn,undefined}]},
+		     {boot_rel,"start_clean"},
+		     {rel,"start_clean","1.0",[]},
+		     {rel,"start_sasl","1.0",[sasl]},
+		     {emu_name,"beam"},
+		     {relocatable,true},
+		     {profile,development},
+		     {incl_sys_filters,[".*"]},
+		     {excl_sys_filters,[]},
+		     {incl_app_filters,[".*"]},
+		     {excl_app_filters,[]},
+		     {incl_archive_filters,[".*"]},
+		     {excl_archive_filters,["^include$","^priv$"]},
+		     {archive_opts,[]},
+		     {rel_app_type,permanent},
+		     {app_file,keep},
+		     {debug_info,keep}]}]},
+	  file:consult(Defaults)),
+
+    KVsn = latest(kernel),
+    StdVsn = latest(stdlib),
+
+    All = filename:join(PrivDir,"save_all.reltool"),
+    ?m(ok, reltool_server:save_config(Pid,All,true,true)),
+    ?msym({ok,[{sys,[{root_dir,_},
+		     {lib_dirs,_},
+		     {mod_cond,all},
+		     {incl_cond,exclude},
+		     {erts,[]},
+		     {app,kernel,[{incl_cond,include},{vsn,KVsn},{mod,_,[]}|_]},
+		     {app,sasl,[{incl_cond,include},{vsn,_},{mod,_,[]}|_]},
+		     {app,stdlib,[{incl_cond,include},{vsn,StdVsn},{mod,_,[]}|_]},
+		     {boot_rel,"start_clean"},
+		     {rel,"start_clean","1.0",[]},
+		     {rel,"start_sasl","1.0",[sasl]},
+		     {emu_name,"beam"},
+		     {relocatable,true},
+		     {profile,development},
+		     {incl_sys_filters,[".*"]},
+		     {excl_sys_filters,[]},
+		     {incl_app_filters,[".*"]},
+		     {excl_app_filters,[]},
+		     {incl_archive_filters,[".*"]},
+		     {excl_archive_filters,["^include$","^priv$"]},
+		     {archive_opts,[]},
+		     {rel_app_type,permanent},
+		     {app_file,keep},
+		     {debug_info,keep}]}]},
+	  file:consult(All)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Test calculation of dependencies
+%% The following test applications are used
+%%
+%% x-1.0: x1.erl   x2.erl   x3.erl
+%%                   \        /         (x2 calls y1, x3 calls y2)
+%% y-1.0:          y1.erl   y2.erl
+%%                    \                 (y1 calls z1)
+%% z-1.0            z1.erl
+%%
+%% Test includes x and derives y and z.
+%%
+dependencies(Config) ->
+    %% Default: all modules included => y and z are included (derived)
+    Sys = {sys,[{lib_dirs,[filename:join(datadir(Config),"dependencies")]},
+		{incl_cond, exclude},
+		{app,kernel,[{incl_cond,include}]},
+		{app,sasl,[{incl_cond,include}]},
+		{app,stdlib,[{incl_cond,include}]},
+		{app,x,[{incl_cond,include}]},
+		{app,y,[{incl_cond,derived}]},
+		{app,z,[{incl_cond,derived}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+
+    ?msym({ok,[#app{name=kernel},
+	       #app{name=sasl},
+	       #app{name=stdlib},
+	       #app{name=x,uses_apps=[y]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+    {ok, Der} = ?msym({ok,_},
+		      reltool_server:get_apps(Pid,derived)),
+    ?msym([#app{name=y,uses_apps=[z]},
+	   #app{name=z}],
+	  rm_missing_app(Der)),
+    ?msym({ok,[]},
+	  reltool_server:get_apps(Pid,source)),
+
+    %% Excluding x2 => y still included since y2 is used by x3
+    %%                 z still included since z1 is used by y1
+    Sys2 = {sys,[{lib_dirs,[filename:join(datadir(Config),"dependencies")]},
+		 {incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,x,[{incl_cond,include},{mod,x2,[{incl_cond,exclude}]}]},
+		 {app,y,[{incl_cond,derived}]},
+		 {app,z,[{incl_cond,derived}]}]},
+    ?m({ok,[]}, reltool_server:load_config(Pid,Sys2)),
+    ?msym({ok,[#app{name=kernel},
+	       #app{name=sasl},
+	       #app{name=stdlib},
+	       #app{name=x,uses_apps=[y]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+    {ok, Der2} = ?msym({ok,_},
+		       reltool_server:get_apps(Pid,derived)),
+    ?msym([#app{name=y,uses_apps=[z]},
+	   #app{name=z}],
+	  rm_missing_app(Der2)),
+    ?msym({ok,[]},
+	  reltool_server:get_apps(Pid,source)),
+
+    %% Excluding x3 => y still included since y1 is used by x2
+    %%                 z still included since z1 is used by y1
+    Sys3 = {sys,[{lib_dirs,[filename:join(datadir(Config),"dependencies")]},
+		 {incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,x,[{incl_cond,include},{mod,x3,[{incl_cond,exclude}]}]},
+		 {app,y,[{incl_cond,derived}]},
+		 {app,z,[{incl_cond,derived}]}]},
+    ?m({ok,[]}, reltool_server:load_config(Pid,Sys3)),
+    ?msym({ok,[#app{name=kernel},
+	       #app{name=sasl},
+	       #app{name=stdlib},
+	       #app{name=x,uses_apps=[y]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+    {ok, Der3} = ?msym({ok,_},
+		       reltool_server:get_apps(Pid,derived)),
+    ?msym([#app{name=y,uses_apps=[z]},
+	   #app{name=z}],
+	  rm_missing_app(Der3)),
+    ?msym({ok,[]},
+	  reltool_server:get_apps(Pid,source)),
+
+    %% Excluding x2 and x3 => y and z excluded
+    Sys4 = {sys,[{lib_dirs,[filename:join(datadir(Config),"dependencies")]},
+		 {incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,x,[{incl_cond,include},
+			 {mod,x2,[{incl_cond,exclude}]},
+			 {mod,x3,[{incl_cond,exclude}]}]},
+		 {app,y,[{incl_cond,derived}]},
+		 {app,z,[{incl_cond,derived}]}]},
+    ?m({ok,[]}, reltool_server:load_config(Pid,Sys4)),
+    ?msym({ok,[#app{name=kernel},
+	       #app{name=sasl},
+	       #app{name=stdlib},
+	       #app{name=x,uses_apps=[]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+    {ok, Der4} = ?msym({ok,_},
+		       reltool_server:get_apps(Pid,derived)),
+    ?msym([], rm_missing_app(Der4)),
+    ?msym({ok,[#app{name=y},
+	       #app{name=z}]},
+	  reltool_server:get_apps(Pid,source)),
+
+    %% Excluding y1 => y still included since y2 is used by x3
+    %%                 z excluded since not used by any other than y1
+    Sys5 = {sys,[{lib_dirs,[filename:join(datadir(Config),"dependencies")]},
+		 {incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,x,[{incl_cond,include}]},
+		 {app,y,[{incl_cond,derived},
+			 {mod,y1,[{incl_cond,exclude}]}]},
+		 {app,z,[{incl_cond,derived}]}]},
+    ?m({ok,[]}, reltool_server:load_config(Pid,Sys5)),
+    ?msym({ok,[#app{name=kernel},
+	       #app{name=sasl},
+	       #app{name=stdlib},
+	       #app{name=x,uses_apps=[y]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+    {ok, Der5} = ?msym({ok,_},
+		       reltool_server:get_apps(Pid,derived)),
+    ?msym([#app{name=y,uses_apps=[]}], rm_missing_app(Der5)),
+    ?msym({ok,[#app{name=z}]},
+	  reltool_server:get_apps(Pid,source)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -478,6 +2004,20 @@ erl_libs() ->
         LibStr -> string:tokens(LibStr, ":;")
     end.
 
+datadir(Config) ->
+    %% Removes the trailing slash...
+    filename:nativename(?config(data_dir,Config)).
+
+latest(App) ->
+    AppStr = atom_to_list(App),
+    AppDirs = filelib:wildcard(filename:join(code:lib_dir(),AppStr++"-*")),
+    [LatestAppDir|_] = lists:reverse(AppDirs),
+    [_,Vsn] = string:tokens(filename:basename(LatestAppDir),"-"),
+    Vsn.
+
+rm_missing_app(Apps) ->
+    lists:keydelete(?MISSING_APP_NAME,#app.name,Apps).
+
 diff_script(Script, Script) ->
     equal;
 diff_script({script, Rel, Commands1}, {script, Rel, Commands2}) ->
@@ -610,14 +2150,16 @@ wait_for_process(Node, Name, N) when is_integer(N), N > 0 ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Run escript
 
-run(Dir, Cmd0) ->
+run(Dir, Script, Args) ->
+    Cmd0 = filename:rootname(Script) ++ " " ++ Args,
     Cmd = case os:type() of
               {win32,_} -> filename:nativename(Dir) ++ "\\" ++ Cmd0;
               _ -> Cmd0
           end,
     do_run(Dir, Cmd).
 
-run(Dir, Opts, Cmd0) ->
+run(Dir, Opts, Script, Args) ->
+    Cmd0 = filename:rootname(Script) ++ " " ++ Args,
     Cmd = case os:type() of
               {win32,_} -> Opts ++ " " ++ filename:nativename(Dir) ++ "\\" ++ Cmd0;
               _ -> Opts ++ " " ++ Dir ++ "/" ++ Cmd0
@@ -626,7 +2168,9 @@ run(Dir, Opts, Cmd0) ->
 
 do_run(Dir, Cmd) ->
     io:format("Run: ~p\n", [Cmd]),
-    Env = [{"PATH",Dir++":"++os:getenv("PATH")}],
+    Env = [{"PATH",Dir++":"++os:getenv("PATH")},
+	   {"ERL_FLAGS",""},   % Make sure no flags are set that can override
+	   {"ERL_ZFLAGS",""}], % any of the flags set in the escript.
     Port = open_port({spawn,Cmd}, [exit_status,eof,in,{env,Env}]),
     Res = get_data(Port, []),
     receive
diff --git a/lib/reltool/test/reltool_server_SUITE_data/Makefile.src b/lib/reltool/test/reltool_server_SUITE_data/Makefile.src
index 049e8dd6cc..8ab077d64b 100644
--- a/lib/reltool/test/reltool_server_SUITE_data/Makefile.src
+++ b/lib/reltool/test/reltool_server_SUITE_data/Makefile.src
@@ -6,8 +6,19 @@ OTP9229= \
      otp_9229/y-1.0/ebin/y.@EMULATOR@ \
      otp_9229/y-1.0/ebin/mylib.@EMULATOR@
 
+DEPENDENCIES= \
+     dependencies/x-1.0/ebin/x1.@EMULATOR@ \
+     dependencies/x-1.0/ebin/x2.@EMULATOR@ \
+     dependencies/x-1.0/ebin/x3.@EMULATOR@ \
+     dependencies/y-1.0/ebin/y1.@EMULATOR@ \
+     dependencies/y-1.0/ebin/y2.@EMULATOR@ \
+     dependencies/z-1.0/ebin/z1.@EMULATOR@
 
-all: $(OTP9229)
+ESCRIPT= \
+     escript/someapp-1.0/ebin/mymod.@EMULATOR@
+
+
+all: $(OTP9229) $(DEPENDENCIES) $(ESCRIPT)
 
 otp_9229/x-1.0/ebin/x.@EMULATOR@: otp_9229/x-1.0/src/x.erl
 	erlc $(EFLAGS) -ootp_9229/x-1.0/ebin otp_9229/x-1.0/src/x.erl
@@ -17,3 +28,19 @@ otp_9229/y-1.0/ebin/y.@EMULATOR@: otp_9229/y-1.0/src/y.erl
 	erlc $(EFLAGS) -ootp_9229/y-1.0/ebin otp_9229/y-1.0/src/y.erl
 otp_9229/y-1.0/ebin/mylib.@EMULATOR@: otp_9229/y-1.0/src/mylib.erl
 	erlc $(EFLAGS) -ootp_9229/y-1.0/ebin otp_9229/y-1.0/src/mylib.erl
+
+dependencies/x-1.0/ebin/x1.@EMULATOR@: dependencies/x-1.0/src/x1.erl
+	erlc $(EFLAGS) -odependencies/x-1.0/ebin dependencies/x-1.0/src/x1.erl
+dependencies/x-1.0/ebin/x2.@EMULATOR@: dependencies/x-1.0/src/x2.erl
+	erlc $(EFLAGS) -odependencies/x-1.0/ebin dependencies/x-1.0/src/x2.erl
+dependencies/x-1.0/ebin/x3.@EMULATOR@: dependencies/x-1.0/src/x3.erl
+	erlc $(EFLAGS) -odependencies/x-1.0/ebin dependencies/x-1.0/src/x3.erl
+dependencies/y-1.0/ebin/y1.@EMULATOR@: dependencies/y-1.0/src/y1.erl
+	erlc $(EFLAGS) -odependencies/y-1.0/ebin dependencies/y-1.0/src/y1.erl
+dependencies/y-1.0/ebin/y2.@EMULATOR@: dependencies/y-1.0/src/y2.erl
+	erlc $(EFLAGS) -odependencies/y-1.0/ebin dependencies/y-1.0/src/y2.erl
+dependencies/z-1.0/ebin/z1.@EMULATOR@: dependencies/z-1.0/src/z1.erl
+	erlc $(EFLAGS) -odependencies/z-1.0/ebin dependencies/z-1.0/src/z1.erl
+
+escript/someapp-1.0/ebin/mymod.@EMULATOR@: escript/someapp-1.0/src/mymod.erl
+	erlc $(EFLAGS) -oescript/someapp-1.0/ebin escript/someapp-1.0/src/mymod.erl
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/ebin/x.app b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/ebin/x.app
new file mode 100644
index 0000000000..ccaab8a8c7
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/ebin/x.app
@@ -0,0 +1,7 @@
+% -*-erlang-*-
+{application, x,
+ [{description, "Main application in reltool dependency test"},
+  {vsn, "1.0"},
+  {modules, [x1,x2,x3]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x1.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x1.erl
new file mode 100644
index 0000000000..bf1e7f9279
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x1.erl
@@ -0,0 +1,5 @@
+-module(x1).
+-compile(export_all).
+
+f() ->
+    ok.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x2.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x2.erl
new file mode 100644
index 0000000000..82191ba278
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x2.erl
@@ -0,0 +1,5 @@
+-module(x2).
+-compile(export_all).
+
+f() ->
+    y1:f().
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x3.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x3.erl
new file mode 100644
index 0000000000..618c75c9a7
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x3.erl
@@ -0,0 +1,5 @@
+-module(x3).
+-compile(export_all).
+
+f() ->
+    y2:f().
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app
new file mode 100644
index 0000000000..d9dac371d7
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app
@@ -0,0 +1,7 @@
+% -*-erlang-*-
+{application, y,
+ [{description, "Library application in reltool dependency test"},
+  {vsn, "1.0"},
+  {modules, [y1,y2]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y1.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y1.erl
new file mode 100644
index 0000000000..dd21b33292
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y1.erl
@@ -0,0 +1,5 @@
+-module(y1).
+-compile(export_all).
+
+f() ->
+    z1:f().
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y2.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y2.erl
new file mode 100644
index 0000000000..bf8ddf6080
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y2.erl
@@ -0,0 +1,5 @@
+-module(y2).
+-compile(export_all).
+
+f() ->
+    ok.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/ebin/z.app b/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/ebin/z.app
new file mode 100644
index 0000000000..437a0968e9
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/ebin/z.app
@@ -0,0 +1,7 @@
+% -*-erlang-*-
+{application, z,
+ [{description, "Library application in reltool dependency test"},
+  {vsn, "1.0"},
+  {modules, [z1]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/src/z1.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/src/z1.erl
new file mode 100644
index 0000000000..97ef90b87f
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/src/z1.erl
@@ -0,0 +1,5 @@
+-module(z1).
+-compile(export_all).
+
+f() ->
+    ok.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dupl_mod/a-1.0/ebin/a.app b/lib/reltool/test/reltool_server_SUITE_data/dupl_mod/a-1.0/ebin/a.app
new file mode 100644
index 0000000000..fada34847a
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dupl_mod/a-1.0/ebin/a.app
@@ -0,0 +1,7 @@
+% -*-erlang-*-
+{application, a,
+ [{description, "Application with duplicated module name in .app file"},
+  {vsn, "1.0"},
+  {modules, [a,a]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/escript/someapp-1.0/ebin/someapp.app b/lib/reltool/test/reltool_server_SUITE_data/escript/someapp-1.0/ebin/someapp.app
new file mode 100644
index 0000000000..ea2209941e
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/escript/someapp-1.0/ebin/someapp.app
@@ -0,0 +1,6 @@
+%% -*- erlang -*-
+{application, someapp,
+ [{description, "Some app for reltool test including archives in escripts"},
+  {vsn, "1.0"},
+  {modules, [someapp]},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/escript/someapp-1.0/src/mymod.erl b/lib/reltool/test/reltool_server_SUITE_data/escript/someapp-1.0/src/mymod.erl
new file mode 100644
index 0000000000..b6c71c666d
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/escript/someapp-1.0/src/mymod.erl
@@ -0,0 +1,26 @@
+%% ``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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved via the world wide web at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(mymod).
+
+-export([main/1]).
+
+%%%-----------------------------------------------------------------
+%%% escript main function
+main(Args) ->
+    io:format("Root dir: ~s\n", [code:root_dir()]),
+    io:format("Script args: ~p\n", [Args]).
diff --git a/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/ebin/a.app b/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/ebin/a.app
new file mode 100644
index 0000000000..ea77103598
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/ebin/a.app
@@ -0,0 +1 @@
+faulty app file
diff --git a/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/src/a.erl b/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/src/a.erl
new file mode 100644
index 0000000000..bb500bed69
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/src/a.erl
@@ -0,0 +1,49 @@
+%% ``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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved via the world wide web at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(a).
+
+
+-behaviour(gen_server).
+
+-vsn(1).
+
+%% External exports
+-export([start_link/0, a/0]).
+%% Internal exports
+-export([init/1, handle_call/3, handle_info/2, terminate/2]).
+
+start_link() -> gen_server:start_link({local, aa}, a, [], []).
+
+a() -> gen_server:call(aa, a).
+
+%%-----------------------------------------------------------------
+%% Callback functions from gen_server
+%%-----------------------------------------------------------------
+init([]) ->
+    process_flag(trap_exit, true),
+    {ok, state}.
+
+handle_call(a, _From, State) ->
+    X = application:get_all_env(a),
+    {reply, X, State}.
+
+handle_info(_, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/src/a_sup.erl b/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/src/a_sup.erl
new file mode 100644
index 0000000000..a141c1767b
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/src/a_sup.erl
@@ -0,0 +1,37 @@
+%% ``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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved via the world wide web at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(a_sup).
+
+
+-behaviour(supervisor).
+
+%% External exports
+-export([start/2]).
+
+%% Internal exports
+-export([init/1]).
+
+start(_, _) ->
+    supervisor:start_link({local, a_sup}, a_sup, []).
+
+init([]) ->
+    SupFlags = {one_for_one, 4, 3600},
+    Config = {a,
+	      {a, start_link, []},
+	      permanent, 2000, worker, [a]},
+    {ok, {SupFlags, [Config]}}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/sort_apps/x-1.0/ebin/x.app b/lib/reltool/test/reltool_server_SUITE_data/sort_apps/x-1.0/ebin/x.app
new file mode 100644
index 0000000000..5fa2a92969
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/sort_apps/x-1.0/ebin/x.app
@@ -0,0 +1,7 @@
+% -*-erlang-*-
+{application, x,
+ [{description, "Application in reltool sort app test - circular dependency"},
+  {vsn, "1.0"},
+  {modules,[]},
+  {registered, []},
+  {applications, [kernel, stdlib, y]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/sort_apps/y-1.0/ebin/y.app b/lib/reltool/test/reltool_server_SUITE_data/sort_apps/y-1.0/ebin/y.app
new file mode 100644
index 0000000000..c4bc62f55f
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/sort_apps/y-1.0/ebin/y.app
@@ -0,0 +1,7 @@
+% -*-erlang-*-
+{application, y,
+ [{description, "Application in reltool sort app test - circular dependency"},
+  {vsn, "1.0"},
+  {modules,[]},
+  {registered, []},
+  {applications, [kernel, stdlib, x]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/sort_apps/z-1.0/ebin/z.app b/lib/reltool/test/reltool_server_SUITE_data/sort_apps/z-1.0/ebin/z.app
new file mode 100644
index 0000000000..8608bc554b
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/sort_apps/z-1.0/ebin/z.app
@@ -0,0 +1,8 @@
+% -*-erlang-*-
+{application, z,
+ [{description, "Application in reltool sort app test - included applications"},
+  {vsn, "1.0"},
+  {modules,[]},
+  {registered, []},
+  {applications, [kernel, stdlib, sasl, inets]},
+  {included_applications, [tools, mnesia]}]}.
diff --git a/lib/reltool/test/reltool_test_lib.erl b/lib/reltool/test/reltool_test_lib.erl
index b8bcbcd009..61f783190c 100644
--- a/lib/reltool/test/reltool_test_lib.erl
+++ b/lib/reltool/test/reltool_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -138,10 +138,6 @@ end_per_testcase(_Func, Config) when is_list(Config) ->
     reset_kill_timer(Config),
     Config.
 
-%% Backwards compatible with test_server
-tc_info(suite) -> [];
-tc_info(doc) -> "".
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% Use ?log(Format, Args) as wrapper
diff --git a/lib/reltool/test/reltool_test_lib.hrl b/lib/reltool/test/reltool_test_lib.hrl
index b592ebb2f0..0dfc08b81c 100644
--- a/lib/reltool/test/reltool_test_lib.hrl
+++ b/lib/reltool/test/reltool_test_lib.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -18,20 +18,10 @@
 
 -include_lib("wx/include/wx.hrl").
 
--define(flat_format(Format,Args), lists:flatten(io_lib:format(Format,Args))).
 -define(log(Format,Args), reltool_test_lib:log(Format,Args,?FILE,?LINE)).
--define(warning(Format,Args), ?log("<WARNING>\n " ++ Format,Args)).
 -define(error(Format,Args), reltool_test_lib:error(Format,Args,?FILE,?LINE)).
 -define(verbose(Format,Args), reltool_test_lib:verbose(Format,Args,?FILE,?LINE)).
 
--define(fatal(Format,Args),
-        ?error(Format, Args),
-        exit({test_case_fatal, Format, Args, ?FILE, ?LINE})).
-
--define(skip(Format,Args),
-        ?warning(Format, Args),
-        exit({skipped, ?flat_format(Format, Args)})).
-
 -define(ignore(Expr),
         fun() ->
                 AcTuAlReS = (catch (Expr)),
@@ -68,25 +58,3 @@
                         AcTuAlReS
                 end
         end()).
-
--define(m_receive(ExpectedMsg),
-        ?m(ExpectedMsg,reltool_test_lib:pick_msg())).
-
--define(m_multi_receive(ExpectedMsgs),
-        fun() ->
-                TmPeXpCtEdMsGs = lists:sort(ExpectedMsgs),              
-                AcTuAlReS = 
-                    lists:sort(lists:map(fun(_) ->
-                                                 reltool_test_lib:pick_msg()
-                                         end, TmPeXpCtEdMsGs)),
-                case AcTuAlReS of
-                    TmPeXpCtEdMsGs ->
-                        ?verbose("ok: ~p\n",[AcTuAlReS]),
-                        AcTuAlReS;
-                    _ ->
-                        reltool_test_lib:error("Not matching actual result was:\n ~p \nExpected ~p\n",
-					       [AcTuAlReS, ExpectedMsgs], 
-					       ?FILE, ?LINE),
-                        AcTuAlReS
-                end
-        end()).
diff --git a/lib/reltool/test/reltool_wx_SUITE.erl b/lib/reltool/test/reltool_wx_SUITE.erl
index 424bc7d189..13d71f4fd6 100644
--- a/lib/reltool/test/reltool_wx_SUITE.erl
+++ b/lib/reltool/test/reltool_wx_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -61,9 +61,46 @@ start_all_windows(TestInfo) when is_atom(TestInfo) ->
     reltool_test_lib:tc_info(TestInfo);
 start_all_windows(_Config) ->
     {ok, SysPid} = ?msym({ok, _}, reltool:start([{trap_exit, false}])),
+    erlang:monitor(process,SysPid),
     {ok, AppPid} = ?msym({ok, _}, reltool_sys_win:open_app(SysPid, stdlib)),
-    ?msym({ok, _}, reltool_app_win:open_mod(AppPid, escript)),
+    erlang:monitor(process,AppPid),
+    {ok, ModPid} = ?msym({ok, _}, reltool_app_win:open_mod(AppPid, escript)),
+    erlang:monitor(process,ModPid),
+
+    %% Let all windows get started
     timer:sleep(timer:seconds(10)),
+
+    %% Test that server pid can be fetched, and that server is alive
+    {ok, Server} = ?msym({ok,_}, reltool:get_server(SysPid)),
+    ?m(true, erlang:is_process_alive(Server)),
+    ?m({ok,{sys,[]}}, reltool:get_config(Server)),
+
+    %% Terminate
+    check_no_win_crash(),
     ?m(ok, reltool:stop(SysPid)),
-    
+    wait_terminate([{sys,SysPid},{app,AppPid},{mod,ModPid}]),
+
     ok.
+
+
+%%%-----------------------------------------------------------------
+%%% Internal functions
+check_no_win_crash() ->
+    receive {'DOWN',_,_,_,_} = Down ->
+	    ct:log("Unexpected termination of window:~n~p",[Down]),
+	    ct:fail("window crashed")
+    after 0 ->
+	    ok
+    end.
+
+wait_terminate([]) ->
+    ok;
+wait_terminate([{Win,P}|Rest]) ->
+    receive
+	{'DOWN',_,process,P,shutdown} ->
+	    wait_terminate(Rest);
+	{'DOWN',_,process,P,Reason} ->
+	    ct:log("~p window terminated with unexpected reason:~n~p",
+		   [Win,Reason]),
+	    ct:fail("unexpected exit reason from window")
+    end.