3 files changed, 19 insertions, 19 deletions
diff --git a/lib/runtime_tools/src/runtime_tools.app.src b/lib/runtime_tools/src/runtime_tools.app.src
index 84cd6ee10d..60be9ed7c9 100644
--- a/lib/runtime_tools/src/runtime_tools.app.src
+++ b/lib/runtime_tools/src/runtime_tools.app.src
@@ -17,14 +17,13 @@
 %% %CopyrightEnd%
 %%
 {application, runtime_tools,
-   [{description,  "RUNTIME_TOOLS version 1"},
+   [{description,  "RUNTIME_TOOLS"},
     {vsn,          "%VSN%"},
     {modules,      [dbg,observer_backend,percept_profile,
 		    runtime_tools,runtime_tools_sup,erts_alloc_config,
 		    ttb_autostart,dyntrace]},
-    {registered,   [runtime_tools_sup,inviso_rt,inviso_rt_meta]},
+    {registered,   [runtime_tools_sup]},
     {applications, [kernel, stdlib]},
-%    {env,          [{inviso_autostart_mod,your_own_autostart_module}]},
     {env,          []},
     {mod,          {runtime_tools, []}}]}.
 
diff --git a/lib/runtime_tools/src/runtime_tools_sup.erl b/lib/runtime_tools/src/runtime_tools_sup.erl
index 913719c449..c8dab250dd 100644
--- a/lib/runtime_tools/src/runtime_tools_sup.erl
+++ b/lib/runtime_tools/src/runtime_tools_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-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
@@ -31,15 +31,11 @@
 %% =============================================================================
 
 %% The runtime tools top most supervisor starts:
-%% -The inviso runtime component. This is the only way to get the runtime component
-%%  started automatically (if for instance autostart is wanted).
-%%  Note that it is not impossible that the runtime component terminates it self
-%%  should it discover that no autostart is configured.
+%% -The ttb_autostart component. This is used for tracing at startup
+%%  using observer/ttb.
 init(AutoModArgs) ->
     Flags = {one_for_one, 0, 3600},
-    Children = [{inviso_rt, {inviso_rt, start_link_auto, [AutoModArgs]}, 
-		 temporary, 3000, worker, [inviso_rt]},
-                {ttb_autostart, {ttb_autostart, start_link, []},
+    Children = [{ttb_autostart, {ttb_autostart, start_link, []},
                  temporary, 3000, worker, [ttb_autostart]}],
     {ok, {Flags, Children}}.
 %% -----------------------------------------------------------------------------
diff --git a/lib/runtime_tools/test/runtime_tools_SUITE.erl b/lib/runtime_tools/test/runtime_tools_SUITE.erl
index b26f3dd881..62497ab527 100644
--- a/lib/runtime_tools/test/runtime_tools_SUITE.erl
+++ b/lib/runtime_tools/test/runtime_tools_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -25,7 +25,7 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases
--export([app_file/1]).
+-export([app_file/1, start_stop_app/1]).
 
 %% Default timetrap timeout (set in init_per_testcase)
 -define(default_timeout, ?t:minutes(1)).
@@ -42,7 +42,8 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [app_file].
+    [app_file,
+     start_stop_app].
 
 groups() -> 
     [].
@@ -60,10 +61,14 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-app_file(suite) ->
-    [];
-app_file(doc) ->
-    ["Testing .app file"];
-app_file(Config) when is_list(Config) ->
+app_file(_Config) ->
     ?line ok = ?t:app_test(runtime_tools),
     ok.
+
+start_stop_app(_Config) ->
+    ok = application:start(runtime_tools),
+    Sup = whereis(runtime_tools_sup),
+    true = is_pid(Sup),
+    Ref = erlang:monitor(process,Sup),
+    ok = application:stop(runtime_tools),
+    receive {'DOWN', Ref, process, Sup, shutdown} -> ok end.