Merge branch 'bjorn/ts-fixes'

* bjorn/ts-fixes:
  ts: Remove the non-working ts:clean/0,1 commands
  ts: Remove the obsolete ts:index/0 command
  ts: Remove the unused module ts_selftest
  ts_run: Make errors from ct:run_test/1 visible

7 files changed, 24 insertions, 813 deletions

diff --git a/lib/test_server/doc/src/ts.xml b/lib/test_server/doc/src/ts.xml
index 7a356755ba..4a2c536e96 100644
--- a/lib/test_server/doc/src/ts.xml
+++ b/lib/test_server/doc/src/ts.xml
@@ -498,29 +498,6 @@ This option is mandatory for remote targets
       </desc>
     </func>
     <func>
-      <name>index() -> ok | {error, Reason}</name>
-      <fsummary>Updates local index page</fsummary>
-      <type>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>This function updates the local index page. This can be
-          useful if a previous test run was not completed and the index
-          is incomplete.</p>
-      </desc>
-    </func>
-    <func>
-      <name>clean() -> ok</name>
-      <name>clean(all) -> ok</name>
-      <fsummary>Cleans up the log directories created when running tests. </fsummary>
-      <desc>
-        <p>This function cleans up log directories created when
-          running test cases. <c>clean/0</c> cleans up all but the last
-          run of each application.  <c>clean/1</c> cleans up all test
-          runs found.</p>
-      </desc>
-    </func>
-    <func>
       <name>estone() -> ok | {error, Reason}</name>
       <name>estone(Opts) -> ok</name>
       <fsummary>Runs the EStone test</fsummary>
diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
index ada9bac05a..bb0b4e55b8 100644
--- a/lib/test_server/src/Makefile
+++ b/lib/test_server/src/Makefile
@@ -49,7 +49,6 @@ MODULES= test_server_ctrl \
 TS_MODULES= \
 	ts \
 	ts_run \
-	ts_reports \
 	ts_lib \
 	ts_make \
 	ts_erl_config \
diff --git a/lib/test_server/src/ts.erl b/lib/test_server/src/ts.erl
index a30f6c65fe..db16b6ecd2 100644
--- a/lib/test_server/src/ts.erl
+++ b/lib/test_server/src/ts.erl
@@ -25,9 +25,8 @@
 -module(ts).
 
 -export([run/0, run/1, run/2, run/3, run/4,
-	 clean/0, clean/1,
 	 tests/0, tests/1,
-	 install/0, install/1, index/0,
+	 install/0, install/1,
 	 bench/0, bench/1, bench/2, benchmarks/0,
 	 estone/0, estone/1,
 	 cross_cover_analyse/1,
@@ -42,17 +41,11 @@
 %%%
 %%%       +-- ts_install --+------  ts_autoconf_win32
 %%%       |
-%%%       |
-%%%       |
 %%% ts ---+                +------  ts_erl_config
 %%%       |                |				     ts_lib
-%%%       |                +------  ts_make
-%%%       |                |
-%%%       +-- ts_run  -----+
+%%%       +-- ts_run  -----+------  ts_make
 %%%       |                |	    			     ts_filelib
 %%%       |                +------  ts_make_erl
-%%%       |                |
-%%%       |                +------  ts_reports (indirectly)
 %%%       |
 %%%       +-- ts_benchmark
 %%%
@@ -77,8 +70,6 @@
 %%%			 and other platforms.
 %%% ts_make_erl		 A corrected version of the standar Erlang module
 %%%			 make (used for rebuilding test suites).
-%%% ts_reports		 Generates index pages in HTML, providing a summary
-%%%			 of the tests run.
 %%% ts_lib		 Miscellanous utility functions, each used by several
 %%%			 other modules.
 %%% ts_benchmark         Supervises otp benchmarks and collects results.
@@ -163,9 +154,6 @@ help(installed) ->
 	 "  ts:tests()        - Shows all available families of tests.\n",
 	 "  ts:tests(Spec)    - Shows all available test modules in Spec,\n",
 	 "                      i.e. ../Spec_test/*_SUITE.erl\n",
-	 "  ts:index()        - Updates local index page.\n",
-	 "  ts:clean()        - Cleans up all but the last tests run.\n",
-	 "  ts:clean(all)     - Cleans up all test runs found.\n",
 	 "  ts:estone()       - Run estone_SUITE in kernel application with\n"
 	 "                      no run options\n",
 	 "  ts:estone(Opts)   - Run estone_SUITE in kernel application with\n"
@@ -201,33 +189,6 @@ install() ->
 install(Options) when is_list(Options) ->
     ts_install:install(install_local,Options).
 
-%% Updates the local index page.
-
-index() ->
-    check_and_run(fun(_Vars) -> ts_reports:make_index(), ok end).
-
-%%
-%% clean(all)
-%% Deletes all logfiles.
-%%
-clean(all) ->
-    delete_files(filelib:wildcard("*" ++ ?logdir_ext)).
-
-%% clean/0
-%%
-%% Cleans up run logfiles, all but the last run.
-clean() ->
-    clean1(filelib:wildcard("*" ++ ?logdir_ext)).
-
-clean1([Dir|Dirs]) ->
-    List0 = filelib:wildcard(filename:join(Dir, "run.*")),
-    case lists:reverse(lists:sort(List0)) of
-	[] -> ok;
-	[_Last|Rest] -> delete_files(Rest)
-    end,
-    clean1(Dirs);
-clean1([]) -> ok.
-
 %% run/0
 %%  Runs all specs found by ts:tests(), if any, or returns
 %%  {error, no_tests_available}. (batch)
@@ -579,32 +540,6 @@ run_test(File, Args, Options) ->
 run_test(File, Args, Options, Vars) ->
     ts_run:run(File, Args, Options, Vars).
 
-
-delete_files([]) -> ok;
-delete_files([Item|Rest]) ->
-    case file:delete(Item) of
-	ok ->
-	    delete_files(Rest);
-	{error,eperm} ->
-	    file:change_mode(Item, 8#777),
-	    delete_files(filelib:wildcard(filename:join(Item, "*"))),
-	    file:del_dir(Item),
-	    ok;
-	{error,eacces} ->
-	    %% We'll see about that!
-	    file:change_mode(Item, 8#777),
-	    case file:delete(Item) of
-		ok -> ok;
-		{error,_} ->
-		    erlang:yield(),
-		    file:change_mode(Item, 8#777),
-		    file:delete(Item),
-		    ok
-	    end;
-	{error,_} -> ok
-    end,
-    delete_files(Rest).
-
 
 %% This module provides some convenient shortcuts to running
 %% the test server from within a started Erlang shell.
diff --git a/lib/test_server/src/ts_lib.erl b/lib/test_server/src/ts_lib.erl
index 3dce19ed65..d9a699ca9f 100644
--- a/lib/test_server/src/ts_lib.erl
+++ b/lib/test_server/src/ts_lib.erl
@@ -25,9 +25,8 @@
 -compile({no_auto_import,[error/1]}).
 -export([error/1, var/2, erlang_type/0,
 	 erlang_type/1,
-	 initial_capital/1, interesting_logs/1, 
-	 specs/1, suites/2, last_test/1,
-	 force_write_file/2, force_delete/1,
+	 initial_capital/1,
+	 specs/1, suites/2,
 	 subst_file/3, subst/2, print_data/1,
 	 make_non_erlang/2,
 	 maybe_atom_to_list/1, progress/4
@@ -91,21 +90,6 @@ initial_capital([C|Rest]) when $a =< C, C =< $z ->
 initial_capital(String) ->
     String.
 
-%% Returns a list of the "interesting logs" in a directory,
-%% i.e. those that correspond to spec files.
-
-interesting_logs(Dir) ->
-    Logs = filelib:wildcard(filename:join(Dir, [$*|?logdir_ext])),
-    Interesting =
-	case specs(Dir) of
-	    [] ->
-		Logs;
-	    Specs0 ->
-		Specs = ordsets:from_list(Specs0),
-		[L || L <- Logs, ordsets:is_element(filename_to_atom(L), Specs)]
-	end,
-    sort_tests(Interesting).
-
 specs(Dir) ->
     Specs = filelib:wildcard(filename:join([filename:dirname(Dir),
 					    "*_test", "*.{dyn,}spec"])),
@@ -165,42 +149,6 @@ suite_order(mnesia) -> 44;
 suite_order(system) -> 999; %% IMPORTANT: system SHOULD always be last!
 suite_order(_) -> 200.
 
-last_test(Dir) ->
-    last_test(filelib:wildcard(filename:join(Dir, "run.[1-2]*")), false).
-
-last_test([Run|Rest], false) ->
-    last_test(Rest, Run);
-last_test([Run|Rest], Latest) when Run > Latest ->
-    last_test(Rest, Run);
-last_test([_|Rest], Latest) ->
-    last_test(Rest, Latest);
-last_test([], Latest) ->
-    Latest.
-
-%% Do the utmost to ensure that the file is written, by deleting or
-%% renaming an old file with the same name.
-
-force_write_file(Name, Contents) ->
-    force_delete(Name),
-    file:write_file(Name, Contents).
-
-force_delete(Name) ->
-    case file:delete(Name) of
-	{error, eacces} ->
-	    force_rename(Name, Name ++ ".old.", 0);
-	Other ->
-	    Other
-    end.
-
-force_rename(From, To, Number) ->
-    Dest = [To|integer_to_list(Number)],
-    case file:read_file_info(Dest) of
-	{ok, _} ->
-	    force_rename(From, To, Number+1);
-	{error, _} ->
-	    file:rename(From, Dest)
-    end.
-
 %% Substitute all occurrences of @var@ in the In file, using
 %% the list of variables in Vars, producing the output file Out.
 %% Returns: ok | {error, Reason}
diff --git a/lib/test_server/src/ts_reports.erl b/lib/test_server/src/ts_reports.erl
deleted file mode 100644
index f981a77ae4..0000000000
--- a/lib/test_server/src/ts_reports.erl
+++ /dev/null
@@ -1,545 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2010. 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%
-%%
-
-%%% Purpose : Produces reports in HTML from the outcome of test suite runs.
-
--module(ts_reports).
-
--export([make_index/0, make_master_index/2, make_progress_index/2]).
--export([count_cases/1, year/0, current_time/0]).
-
--include_lib("kernel/include/file.hrl").
--include("ts.hrl").
-
--compile({no_auto_import,[error/1]}).
-
--import(filename, [basename/1, rootname/1]).
--import(ts_lib, [error/1]).
-
-
-%% Make master index page which points out index pages for all platforms.
-
-make_master_index(Dir, Vars) ->
-    IndexName = filename:join(Dir, "index.html"),
-    {ok, Index0} = make_master_index1(directories(Dir), master_header(Vars)),
-    Index = [Index0|master_footer()],
-    io:put_chars("Updating " ++ IndexName ++ "... "),
-    ok = ts_lib:force_write_file(IndexName, Index),
-    io:put_chars("done\n").
-
-make_master_index1([Dir|Rest], Result) ->
-    NewResult = 
-	case catch read_variables(Dir) of
-	    {'EXIT',{{bad_installation,Reason},_}} ->
-		io:put_chars("Failed to read " ++ filename:join(Dir,?variables)++
-			     ": " ++ Reason ++ " - Ignoring this directory\n"),
-		Result;
-	    Vars ->
-		Platform = ts_lib:var(platform_label, Vars),
-		case make_index(Dir, Vars, false) of
-		    {ok, Summary} ->
-			make_master_index(Platform, Dir, Summary, Result);
-		    {error, _} ->
-			Result
-		end
-	end,
-    make_master_index1(Rest, NewResult);
-make_master_index1([], Result) ->
-    {ok, Result}.
-
-make_progress_index(Dir, Vars) ->
-    IndexName = filename:join(Dir, "index.html"),
-    io:put_chars("Updating " ++ IndexName ++ "... "),
-    Index0=progress_header(Vars),
-    ts_lib:force_delete(IndexName),
-    Dirs=find_progress_runs(Dir),
-    Index1=[Index0|make_progress_links(Dirs, [])],
-    IndexF=[Index1|progress_footer()],
-    ok = ts_lib:force_write_file(IndexName, IndexF),
-    io:put_chars("done\n").
-
-find_progress_runs(Dir) ->
-    case file:list_dir(Dir) of
-	{ok, Dirs0} ->
-	    Dirs1= [filename:join(Dir,X) || X <- Dirs0, 
-			 filelib:is_dir(filename:join(Dir,X))],
-	    lists:sort(Dirs1);
-	_ ->
-	    []
-    end.
-
-name_from_vars(Dir, Platform) ->
-    VarFile=filename:join([Dir, Platform, "variables"]),
-    case file:consult(VarFile) of
-	{ok, Vars} ->
-	    ts_lib:var(platform_id, Vars);
-	_Other ->
-	    Platform
-    end.
-
-make_progress_links([], Acc) ->
-    Acc;
-make_progress_links([RDir|Rest], Acc) ->
-    Dir=filename:basename(RDir),
-    Platforms=[filename:basename(X) ||
-		  X <- find_progress_runs(RDir)],
-    PlatformLinks=["<A HREF=\""++filename:join([Dir,X,"index.html"])
-		   ++"\">"++name_from_vars(RDir, X)++"</A><BR>" ||
-		      X <- Platforms],
-    LinkName=Dir++"/index.html",
-    Link =
-    [
-     "<TR valign=top>\n",
-     "<TD><A HREF=\"", LinkName, "\">", Dir, "</A></TD>", "\n",
-     "<TD>", PlatformLinks, "</TD>", "\n"
-    ],
-    make_progress_links(Rest, [Link|Acc]).
-
-read_variables(Dir) ->
-    case file:consult(filename:join(Dir, ?variables)) of
-	{ok, Vars} -> Vars;
-	{error, Reason} ->
-	    erlang:error({bad_installation,file:format_error(Reason)}, [Dir])
-    end.
-
-make_master_index(Platform, Dirname, {Succ, Fail, UserSkip,AutoSkip}, Result) ->
-    Link = filename:join(filename:basename(Dirname), "index.html"),
-    FailStr =
-	if Fail > 0 ->  
-		["<FONT color=\"red\">",
-		 integer_to_list(Fail),"</FONT>"];
-	   true ->
-		integer_to_list(Fail)
-	end,
-    AutoSkipStr =
-	if AutoSkip > 0 ->
-		["<FONT color=\"brown\">",
-		 integer_to_list(AutoSkip),"</FONT>"];
-	   true -> integer_to_list(AutoSkip)
-	end,
-    [Result,
-     "<TR valign=top>\n",
-     "<TD><A HREF=\"", Link, "\">", Platform, "</A></TD>", "\n",
-     make_row(integer_to_list(Succ), false),
-     make_row(FailStr, false),
-     make_row(integer_to_list(UserSkip), false),
-     make_row(AutoSkipStr, false),
-     "</TR>\n"].
-
-%% Make index page which points out individual test suites for a single platform.
-
-make_index() ->
-    {ok, Pwd} = file:get_cwd(),
-    Vars = read_variables(Pwd),
-    make_index(Pwd, Vars, true).
-
-make_index(Dir, Vars, IncludeLast) ->
-    IndexName = filename:absname("index.html", Dir),
-    io:put_chars("Updating " ++ IndexName ++ "... "),
-    case catch make_index1(Dir, IndexName, Vars, IncludeLast) of
-	{'EXIT', Reason} ->
-	    io:put_chars("CRASHED!\n"),
-	    io:format("~p~n", [Reason]),
-	    {error, Reason};
-	{error, Reason} ->
-	    io:put_chars("FAILED\n"),
-	    io:format("~p~n", [Reason]),
-	    {error, Reason};
-	{ok, Summary} ->
-	    io:put_chars("done\n"),
-	    {ok, Summary};
-	Err ->
-	    io:format("Unknown internal error. Please report.\n(Err: ~p, ID: 1)",
-		      [Err]),
-	    {error, Err}
-    end.
-
-make_index1(Dir, IndexName, Vars, IncludeLast) ->
-    Logs0 = ts_lib:interesting_logs(Dir),
-    Logs = 
-	case IncludeLast of
-	    true  -> add_last_name(Logs0);
-	    false -> Logs0
-	end,
-    {ok, {Index0, Summary}} = make_index(Logs, header(Vars), 0, 0, 0, 0, 0),
-    Index = [Index0|footer()],
-    case ts_lib:force_write_file(IndexName, Index) of
-	ok ->
-	    {ok, Summary};
-	{error, Reason} ->
-	    error({index_write_error, Reason})
-    end.
-
-make_index([Name|Rest], Result, TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt) ->
-    case ts_lib:last_test(Name) of
-	false ->
-	    %% Silently skip.
-	    make_index(Rest, Result, TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt);
-	Last ->
-	    case count_cases(Last) of
-		{Succ, Fail, USkip, ASkip} ->
-		    Cov = 
-			case file:read_file(filename:join(Last,?cover_total)) of
-			    {ok,Bin} -> 
-				TotCoverage = binary_to_term(Bin),
-				io_lib:format("~w %",[TotCoverage]);
-			    _error -> 
-				""
-			end,
-		    Link = filename:join(basename(Name), basename(Last)),
-		    JustTheName = rootname(basename(Name)),
-		    NotBuilt = not_built(JustTheName),
-		    NewResult = [Result, make_index1(JustTheName,
-						     Link, Succ, Fail, USkip, ASkip, 
-						     NotBuilt, Cov, false)],
-		    make_index(Rest, NewResult, TotSucc+Succ, TotFail+Fail, 
-			       UserSkip+USkip, AutoSkip+ASkip, TotNotBuilt+NotBuilt);
-		error ->
-		    make_index(Rest, Result, TotSucc, TotFail, UserSkip, AutoSkip,
-			       TotNotBuilt)
-	    end
-    end;
-make_index([], Result, TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt) ->
-    {ok, {[Result|make_index1("Total", no_link,
-			      TotSucc, TotFail, UserSkip, AutoSkip, 
-			      TotNotBuilt, "", true)],
-	  {TotSucc, TotFail, UserSkip, AutoSkip}}}.
-
-make_index1(SuiteName, Link, Success, Fail, UserSkip, AutoSkip, NotBuilt, Coverage, Bold) ->
-    Name = test_suite_name(SuiteName),
-    FailStr =
-	if Fail > 0 ->  
-		["<FONT color=\"red\">",
-		 integer_to_list(Fail),"</FONT>"];
-	   true ->
-		integer_to_list(Fail)
-	end,
-    AutoSkipStr =
-	if AutoSkip > 0 ->
-		["<FONT color=\"brown\">",
-		 integer_to_list(AutoSkip),"</FONT>"];
-	   true -> integer_to_list(AutoSkip)
-	end,
-    ["<TR valign=top>\n",
-     "<TD>",
-     case Link of
-	 no_link ->
-	     ["<B>", Name|"</B>"];
-	 _Other  ->
-	     CrashDumpName = SuiteName ++ "_erl_crash.dump",
-	     CrashDumpLink = 
-		 case filelib:is_file(CrashDumpName) of
-		     true -> 
-			 ["&nbsp;<A HREF=\"", CrashDumpName, 
-			  "\">(CrashDump)</A>"];
-		     false ->
-			 ""
-		 end,
-	     LogFile = filename:join(Link, ?suitelog_name ++ ".html"),
-	     ["<A HREF=\"", LogFile, "\">", Name, "</A>\n", CrashDumpLink, 
-	      "</TD>\n"]
-     end,
-     make_row(integer_to_list(Success), Bold),
-     make_row(FailStr, Bold),
-     make_row(integer_to_list(UserSkip), Bold),
-     make_row(AutoSkipStr, Bold),
-     make_row(integer_to_list(NotBuilt), Bold),
-     make_row(Coverage, Bold),
-     "</TR>\n"].
-
-make_row(Row, true) ->
-    ["<TD ALIGN=right><B>", Row|"</B></TD>"];
-make_row(Row, false) ->
-    ["<TD ALIGN=right>", Row|"</TD>"].
-
-not_built(BaseName) ->
-    Dir = filename:join("..", BaseName++"_test"), 
-    Erl = length(filelib:wildcard(filename:join(Dir,"*_SUITE.erl"))),
-    Beam = length(filelib:wildcard(filename:join(Dir,"*_SUITE.beam"))),
-    Erl-Beam.
-
-
-%% Add the log file directory for the very last test run (according to
-%% last_name).
-
-add_last_name(Logs) ->
-    case file:read_file("last_name") of
-	{ok, Bin} ->
-	    Name = filename:dirname(lib:nonl(binary_to_list(Bin))),
-	    case lists:member(Name, Logs) of
-		true  -> Logs;
-		false -> [Name|Logs]
-	    end;
-	_ ->
-	    Logs
-    end.
-
-term_to_text(Term) ->
-    lists:flatten(io_lib:format("~p.\n", [Term])).
-
-test_suite_name(Name) ->
-    ts_lib:initial_capital(Name) ++ " suite".
-
-directories(Dir) ->
-    {ok, Files} = file:list_dir(Dir),
-    [filename:join(Dir, X) || X <- Files,
-			      filelib:is_dir(filename:join(Dir, X))].
-
-
-%%% Headers and footers.
-
-header(Vars) ->
-    Platform = ts_lib:var(platform_id, Vars),
-    ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n"
-     "<!-- autogenerated by '"++atom_to_list(?MODULE)++"'. -->\n"
-     "<HTML>\n",
-     "<HEAD>\n",
-     "<TITLE>Test Results for ", Platform, "</TITLE>\n",
-     "</HEAD>\n",
-
-     body_tag(),
-
-     "<!-- ---- DOCUMENT TITLE  ---- -->\n",
-
-     "<CENTER>\n",
-     "<H1>Test Results for ", Platform, "</H1>\n",
-     "</CENTER>\n",
-
-     "<!-- ---- CONTENT ---- -->\n",
-     "<CENTER>\n",
-
-     "<TABLE border=3 cellpadding=5>\n",
-     "<th><B>Family</B></th>\n",
-     "<th>Successful</th>\n",
-     "<th>Failed</th>\n",
-     "<th>User Skipped</th>\n"
-     "<th>Auto Skipped</th>\n"
-     "<th>Missing Suites</th>\n"
-     "<th>Coverage</th>\n"
-     "\n"].
-
-footer() ->
-    ["</TABLE>\n"
-     "</CENTER>\n"
-     "<P><CENTER>\n"
-     "<HR>\n"
-     "<P><FONT SIZE=-1>\n"
-     "Copyright &copy; ", year(),
-     " <A HREF=\"http://erlang.ericsson.se\">Open Telecom Platform</A><BR>\n"
-     "Updated: <!date>", current_time(), "<!/date><BR>\n"
-     "</FONT>\n"
-     "</CENTER>\n"
-     "</body>\n"
-     "</HTML>\n"].
-
-progress_header(Vars) ->
-    Release = ts_lib:var(erl_release, Vars),
-    ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n"
-     "<!-- autogenerated by '"++atom_to_list(?MODULE)++"'. -->\n"
-     "<HTML>\n",
-     "<HEAD>\n",
-     "<TITLE>", Release, " Progress Test Results</TITLE>\n",
-     "</HEAD>\n",
-
-     body_tag(),
-
-     "<!-- ---- DOCUMENT TITLE ---- -->\n",
-
-     "<CENTER>\n",
-     "<H1>", Release, " Progress Test Results</H1>\n",
-     "<TABLE border=3 cellpadding=5>\n",
-     "<th><b>Test Run</b></th><th>Platforms</th>\n"].
-
-progress_footer() ->
-    ["</TABLE>\n",
-     "</CENTER>\n",
-     "<P><CENTER>\n",
-     "<HR>\n",
-     "<P><FONT SIZE=-1>\n",
-     "Copyright &copy; ", year(),
-     " <A HREF=\"http://erlang.ericsson.se\">Open Telecom Platform</A><BR>\n",
-     "Updated: <!date>", current_time(), "<!/date><BR>\n",
-     "</FONT>\n",
-     "</CENTER>\n",
-     "</body>\n",
-     "</HTML>\n"].
-
-master_header(Vars) ->
-    Release = ts_lib:var(erl_release, Vars),
-    Vsn = erlang:system_info(version),
-    ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n"
-     "<!-- autogenerated by '"++atom_to_list(?MODULE)++"'. -->\n"
-     "<HTML>\n",
-     "<HEAD>\n",
-     "<TITLE>", Release, " Test Results (", Vsn, ")</TITLE>\n",
-     "</HEAD>\n",
-
-     body_tag(),
-
-     "<!-- ---- DOCUMENT TITLE ---- -->\n",
-
-     "<CENTER>\n",
-     "<H1>", Release, " Test Results (", Vsn, ")</H1>\n",
-     "</CENTER>\n",
-
-     "<!-- ---- CONTENT ---- -->\n",
-
-     "<CENTER>\n",
-     
-     "<TABLE border=3 cellpadding=5>\n",
-     "<th><b>Platform</b></th>\n",
-     "<th>Successful</th>\n",
-     "<th>Failed</th>\n",
-     "<th>User Skipped</th>\n"
-     "<th>Auto Skipped</th>\n"
-     "\n"].
-
-master_footer() ->
-    ["</TABLE>\n",
-     "</CENTER>\n",
-     "<P><CENTER>\n",
-     "<HR>\n",
-     "<P><FONT SIZE=-1>\n",
-     "Copyright &copy; ", year(), 
-     " <A HREF=\"http://erlang.ericsson.se\">Open Telecom Platform</A><BR>\n",
-     "Updated: <!date>", current_time(), "<!/date><BR>\n",
-     "</FONT>\n",
-     "</CENTER>\n",
-     "</body>\n",
-     "</HTML>\n"].
-
-body_tag() ->
-    "<body bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#0000FF\""
-	"vlink=\"#800080\" alink=\"#FF0000\">".
-
-year() ->
-    {Y, _, _} = date(),
-    integer_to_list(Y).
-
-current_time() ->
-    {{Y, Mon, D}, {H, Min, S}} = calendar:local_time(),
-    Weekday = weekday(calendar:day_of_the_week(Y, Mon, D)),
-    lists:flatten(io_lib:format("~s ~s ~p ~2.2.0w:~2.2.0w:~2.2.0w ~w",
-				[Weekday, month(Mon), D, H, Min, S, Y])).
-
-weekday(1) -> "Mon";
-weekday(2) -> "Tue";
-weekday(3) -> "Wed";
-weekday(4) -> "Thu";
-weekday(5) -> "Fri";
-weekday(6) -> "Sat";
-weekday(7) -> "Sun".
-
-month(1) -> "Jan";
-month(2) -> "Feb";
-month(3) -> "Mar";
-month(4) -> "Apr";
-month(5) -> "May";
-month(6) -> "Jun";
-month(7) -> "Jul";
-month(8) -> "Aug";
-month(9) -> "Sep";
-month(10) -> "Oct";
-month(11) -> "Nov";
-month(12) -> "Dec".
-
-%% Count test cases in the given directory (a directory of the type
-%% run.1997-08-04_09.58.52).
-
-count_cases(Dir) ->
-    SumFile = filename:join(Dir, ?run_summary),
-    case read_summary(SumFile, [summary]) of
-	{ok, [{Succ,Fail,Skip}]} ->
-	    {Succ,Fail,Skip,0};
-	{ok, [Summary]} ->
-	    Summary;
-	{error, _} ->
-	    LogFile = filename:join(Dir, ?suitelog_name),
-	    case file:read_file(LogFile) of
-		{ok, Bin} ->
-		    Summary = count_cases1(binary_to_list(Bin), {0, 0, 0, 0}),
-		    write_summary(SumFile, Summary),
-		    Summary;
-		{error, _Reason} ->
-		    io:format("\nFailed to read ~p (skipped)\n", [LogFile]),
-		    error
-	    end
-    end.
-
-write_summary(Name, Summary) ->
-    File = [term_to_text({summary, Summary})],
-    ts_lib:force_write_file(Name, File).
-
-% XXX: This function doesn't do what the writer expect. It can't handle
-% the case if there are several different keys and I had to add a special
-% case for the empty file. The caller also expect just one tuple as
-% a result so this function is written way to general for no reason.
-% But it works sort of. /kgb
-
-read_summary(Name, Keys) ->
-    case file:consult(Name) of
-	{ok, []} ->
-	    {error, "Empty summary file"};
-	{ok, Terms} ->
-	    {ok, lists:map(fun(Key) -> {value, {_, Value}} = 
-					   lists:keysearch(Key, 1, Terms),
-				       Value end,
-			   Keys)};
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-count_cases1("=failed" ++ Rest, {Success, _Fail, UserSkip,AutoSkip}) ->
-    {NextLine, Count} = get_number(Rest),
-    count_cases1(NextLine, {Success, Count, UserSkip,AutoSkip});
-count_cases1("=successful" ++ Rest, {_Success, Fail, UserSkip,AutoSkip}) ->
-    {NextLine, Count} = get_number(Rest),
-    count_cases1(NextLine, {Count, Fail, UserSkip,AutoSkip});
-count_cases1("=skipped" ++ Rest, {Success, Fail, _UserSkip,AutoSkip}) ->
-    {NextLine, Count} = get_number(Rest),
-    count_cases1(NextLine, {Success, Fail, Count,AutoSkip});
-count_cases1("=user_skipped" ++ Rest, {Success, Fail, _UserSkip,AutoSkip}) ->
-    {NextLine, Count} = get_number(Rest),
-    count_cases1(NextLine, {Success, Fail, Count,AutoSkip});
-count_cases1("=auto_skipped" ++ Rest, {Success, Fail, UserSkip,_AutoSkip}) ->
-    {NextLine, Count} = get_number(Rest),
-    count_cases1(NextLine, {Success, Fail, UserSkip,Count});
-count_cases1([], Counters) ->
-    Counters;
-count_cases1(Other, Counters) ->
-    count_cases1(skip_to_nl(Other), Counters).
-
-get_number([$\s|Rest]) ->
-    get_number(Rest);
-get_number([Digit|Rest]) when $0 =< Digit, Digit =< $9 ->
-    get_number(Rest, Digit-$0).
-
-get_number([Digit|Rest], Acc) when $0 =< Digit, Digit =< $9 ->
-    get_number(Rest, Acc*10+Digit-$0);
-get_number([$\n|Rest], Acc) ->
-    {Rest, Acc};
-get_number([_|Rest], Acc) ->
-    get_number(Rest, Acc).
-
-skip_to_nl([$\n|Rest]) ->
-    Rest;
-skip_to_nl([_|Rest]) ->
-    skip_to_nl(Rest);
-skip_to_nl([]) ->
-    [].
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl
index e108a22839..f4d5b3e3b1 100644
--- a/lib/test_server/src/ts_run.erl
+++ b/lib/test_server/src/ts_run.erl
@@ -21,7 +21,7 @@
 
 -module(ts_run).
 
--export([run/4]).
+-export([run/4,ct_run_test/2]).
 
 -define(DEFAULT_MAKE_TIMETRAP_MINUTES, 60).
 -define(DEFAULT_UNMAKE_TIMETRAP_MINUTES, 15).
@@ -87,6 +87,24 @@ execute([Hook|Rest], Vars0, Spec0, St0) ->
 execute([], Vars, Spec, St) ->
     {ok, Vars, Spec, St}.
 
+%% Wrapper to run tests using ct:run_test/1 and handle any errors.
+
+ct_run_test(Dir, CommonTestArgs) ->
+    try
+	ok = file:set_cwd(Dir),
+	case ct:run_test(CommonTestArgs) of
+	    {_,_,_} ->
+		ok;
+	    {error,Error} ->
+		io:format("ERROR: ~P\n", [Error,20]);
+	    Other ->
+		io:format("~P\n", [Other,20])
+	end
+    catch
+	_:Crash ->
+	    io:format("CRASH: ~P\n", [Crash,20])
+    end.
+
 %%
 %% Deletes File from Files when File is on the form .../<SUITE>_data/<file>
 %% when all of <SUITE> has been skipped in Spec, i.e. there
@@ -230,8 +248,7 @@ make_command(Vars, Spec, State) ->
 	   " -boot start_sasl -sasl errlog_type error",
 	   " -pz \"",Cwd,"\"",
 	   " -ct_test_vars ",TestVars,
-	   " -eval \"file:set_cwd(\\\"",TestDir,"\\\")\" "
-	   " -eval \"ct:run_test(", 
+	   " -eval \"ts_run:ct_run_test(\\\"",TestDir,"\\\", ",
 	   backslashify(lists:flatten(State#state.test_server_args)),")\""
 	   " ",
 	   ExtraArgs],
diff --git a/lib/test_server/src/ts_selftest.erl b/lib/test_server/src/ts_selftest.erl
deleted file mode 100644
index 655aa4bab3..0000000000
--- a/lib/test_server/src/ts_selftest.erl
+++ /dev/null
@@ -1,120 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. 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(ts_selftest).
--export([selftest/0]).
-
-selftest() ->
-    case node() of
-	nonode@nohost ->
-	    io:format("Sorry, you have to start this node distributed.~n"),
-	    exit({error, node_not_distributed});
-	_ ->
-	    ok
-    end,
-    case catch ts:tests(test_server) of
-	{'EXIT', _} ->
-	    io:format("Test Server self test not availiable.");
-	Other ->
-	    selftest1()
-    end.
-
-selftest1() ->
-    % Batch starts
-    io:format("Selftest #1: Whole spec, batch mode:~n"),
-    io:format("------------------------------------~n"),
-    ts:run(test_server, [batch]),
-    ok=check_result(1, "test_server.logs", 2),
-
-    io:format("Selftest #2: One module, batch mode:~n"),
-    io:format("------------------------------------~n"),
-    ts:run(test_server, test_server_SUITE, [batch]),
-    ok=check_result(2, "test_server_SUITE.logs", 2),
-
-    io:format("Selftest #3: One testcase, batch mode:~n"),
-    io:format("--------------------------------------~n"),
-    ts:run(test_server, test_server_SUITE, msgs, [batch]),
-    ok=check_result(3, "test_server_SUITE.logs", 0),
-
-    % Interactive starts
-    io:format("Selftest #4: Whole spec, interactive mode:~n"),
-    io:format("------------------------------------------~n"),
-    ts:run(test_server),
-    kill_test_server(),
-    ok=check_result(4, "test_server.logs", 2),
-
-    io:format("Selftest #5: One module, interactive mode:~n"),
-    io:format("------------------------------------------~n"),
-    ts:run(test_server, test_server_SUITE),
-    kill_test_server(),
-    ok=check_result(5, "test_server_SUITE.logs", 2),
-
-    io:format("Selftest #6: One testcase, interactive mode:~n"),
-    io:format("--------------------------------------------~n"),
-    ts:run(test_server, test_server_SUITE, msgs),
-    kill_test_server(),
-    ok=check_result(6, "test_server_SUITE.logs", 0),
-    
-    ok.
-
-check_result(Test, TDir, ExpSkip) ->
-    Dir=ts_lib:last_test(TDir),
-    {Total, Failed, Skipped}=ts_reports:count_cases(Dir),
-		io:format("Selftest #~p:",[Test]),
-    case {Total, Failed, Skipped} of
-	{_, 0, ExpSkip} ->        % 2 test cases should be skipped.
-	    io:format("All ok.~n~n"),
-	    ok;
-	{_, _, _} ->
-	    io:format("Not completely successful.~n~n"),
-	    error
-    end.
-
-
-%% Wait for test server to get started.
-kill_test_server() ->
-    Node=list_to_atom("test_server@"++atom_to_list(hostname())),
-    net_adm:ping(Node),
-    case whereis(test_server_ctrl) of
-	undefined ->
-	    kill_test_server();
-	Pid ->
-	    kill_test_server(0, Pid)
-    end.
-
-%% Wait for test server to finish.
-kill_test_server(30, Pid) ->
-    exit(self(), test_server_is_dead);
-kill_test_server(Num, Pid) ->
-    case whereis(test_server_ctrl) of
-	undefined ->
-	    slave:stop(node(Pid));
-	Pid ->
-	    receive
-	    after
-		1000 ->
-		    kill_test_server(Num+1, Pid)
-	    end
-    end.
-
-
-hostname() ->
-    list_to_atom(from($@, atom_to_list(node()))).
-from(H, [H | T]) -> T;
-from(H, [_ | T]) -> from(H, T);
-from(H, []) -> [].