Merge branch 'siri/cuddle-with-tests'

* siri/cuddle-with-tests:
  [common_test] Clean logdir for ct_surefire_SUITE
  [common_test] Fix log dirs on windows
  [test_server] Fix copyright in erl2html2_SUITE.erl
  Fix release_handler_SUITE:otp_9395_check_old_code

3 files changed, 71 insertions, 38 deletions

diff --git a/lib/common_test/test/ct_surefire_SUITE.erl b/lib/common_test/test/ct_surefire_SUITE.erl
index 69e98cef48..b86b47f0a2 100644
--- a/lib/common_test/test/ct_surefire_SUITE.erl
+++ b/lib/common_test/test/ct_surefire_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2013. 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
@@ -32,6 +32,7 @@
 -include_lib("common_test/include/ct_event.hrl").
 
 -include_lib("xmerl/include/xmerl.hrl").
+-include_lib("kernel/include/file.hrl").
 
 -define(eh, ct_test_support_eh).
 
@@ -77,53 +78,52 @@ all() ->
 %%%-----------------------------------------------------------------
 %%%
 default(Config) when is_list(Config) ->
-    run(default,[cth_surefire],Config),
-    PrivDir = ?config(priv_dir,Config),
-    XmlRe = filename:join([PrivDir,"*","junit_report.xml"]),
-    check_xml(default,XmlRe).
+    run(default,[cth_surefire],"junit_report.xml",Config).
 
 absolute_path(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir,Config),
     Path = filename:join(PrivDir,"abspath.xml"),
-    run(absolute_path,[{cth_surefire,[{path,Path}]}],Config),
-    check_xml(absolute_path,Path).
+    run(absolute_path,[{cth_surefire,[{path,Path}]}],Path,Config).
 
 relative_path(Config) when is_list(Config) ->
     Path = "relpath.xml",
-    run(relative_path,[{cth_surefire,[{path,Path}]}],Config),
-    PrivDir = ?config(priv_dir,Config),
-    XmlRe = filename:join([PrivDir,"*",Path]),
-    check_xml(relative_path,XmlRe).
+    run(relative_path,[{cth_surefire,[{path,Path}]}],Path,Config).
 
 url(Config) when is_list(Config) ->
     Path = "url.xml",
-    run(url,[{cth_surefire,[{url_base,?url_base},
-			    {path,Path}]}],Config),
-    PrivDir = ?config(priv_dir,Config),
-    XmlRe = filename:join([PrivDir,"*",Path]),
-    check_xml(url,XmlRe).
+    run(url,[{cth_surefire,[{url_base,?url_base},{path,Path}]}],
+	Path,Config).
 
 logdir(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir,Config),
-    LogDir = filename:join(PrivDir,"specific_logdir"),
-    file:make_dir(LogDir),
+    Opts = ct_test_support:get_opts(Config),
+    LogDir =
+	case lists:keyfind(logdir,1,Opts) of
+	    {logdir,LD} -> LD;
+	    false -> ?config(priv_dir,Config)
+	end,
+    MyLogDir = filename:join(LogDir,"specific_logdir"),
+    ensure_exists_empty(MyLogDir),
     Path = "logdir.xml",
-    run(logdir,[{cth_surefire,[{path,Path}]}],Config,[{logdir,LogDir}]),
-    PrivDir = ?config(priv_dir,Config),
-    XmlRe = filename:join([LogDir,"*",Path]),
-    check_xml(logdir,XmlRe).
+    run(logdir,[{cth_surefire,[{path,Path}]}],Path,Config,[{logdir,MyLogDir}]).
 
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
-run(Case,CTHs,Config) ->
-    run(Case,CTHs,Config,[]).
-run(Case,CTHs,Config,ExtraOpts) ->
+run(Case,CTHs,Report,Config) ->
+    run(Case,CTHs,Report,Config,[]).
+run(Case,CTHs,Report,Config,ExtraOpts) ->
     DataDir = ?config(data_dir, Config),
     Suite = filename:join(DataDir, "surefire_SUITE"),
     {Opts,ERPid} = setup([{suite,Suite},{ct_hooks,CTHs},{label,Case}|ExtraOpts],
 			 Config),
-    ok = execute(Case, Opts, ERPid, Config).
+    ok = execute(Case, Opts, ERPid, Config),
+    LogDir =
+	case lists:keyfind(logdir,1,Opts) of
+	    {logdir,LD} -> LD;
+	    false -> ?config(priv_dir,Config)
+	end,
+    Re = filename:join([LogDir,"*",Report]),
+    check_xml(Case,Re).
 
 setup(Test, Config) ->
     Opts0 = ct_test_support:get_opts(Config),
@@ -349,3 +349,26 @@ get_numbers_from_attrs([_|A],T,E,F,S) ->
     get_numbers_from_attrs(A,T,E,F,S);
 get_numbers_from_attrs([],T,E,F,S) ->
     {T,E,F,S}.
+
+ensure_exists_empty(Dir) ->
+    case file:list_dir(Dir) of
+	{error,enoent} ->
+	    file:make_dir(Dir);
+	{ok,Files} ->
+	    del_files(Dir,Files)
+    end.
+
+del_files(Dir,[F0|Fs] ) ->
+    F = filename:join(Dir,F0),
+    case file:read_file_info(F) of
+	{ok,#file_info{type=directory}} ->
+	    {ok,Files} = file:list_dir(F),
+	    del_files(F,Files),
+	    file:del_dir(F),
+	    del_files(Dir,Fs);
+	_ ->
+	    file:delete(F),
+	    del_files(Dir,Fs)
+    end;
+del_files(_,[]) ->
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index 94cffc988d..82b7a738bb 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -938,7 +938,7 @@ otp_9417(cleanup,_Conf) ->
 
 %% OTP-9395 - performance problems when there are MANY processes
 %% Test that the procedure of checking for old code before an upgrade
-%% can be started is "very much faster" when there is no old code in
+%% can be started is faster when there is no old code in
 %% the system.
 otp_9395_check_old_code(Conf) when is_list(Conf) ->
 
@@ -978,8 +978,8 @@ otp_9395_check_old_code(Conf) when is_list(Conf) ->
 		   "\tAfter purge: ~.2f sec~n"
 		   "\tT1/T2: ~.2f",
 		   [NProcs,length(Modules),T1/1000000,T2/1000000,X]),
-	    if X < 1000 ->
-		    ct:fail({not_enough_improvement_after_purge,round(X)});
+	    if X < 1 ->
+		    ct:fail({no_improvement_after_purge,X});
 	       true ->
 		    ok
 	    end;
diff --git a/lib/test_server/test/erl2html2_SUITE.erl b/lib/test_server/test/erl2html2_SUITE.erl
index 96175413a1..37c2b74d8e 100644
--- a/lib/test_server/test/erl2html2_SUITE.erl
+++ b/lib/test_server/test/erl2html2_SUITE.erl
@@ -1,11 +1,21 @@
-%%%-------------------------------------------------------------------
-%%% @author Siri Hansen <[email protected]>
-%%% @copyright (C) 2012, Siri Hansen
-%%% @doc
-%%%
-%%% @end
-%%% Created : 15 Nov 2012 by Siri Hansen <[email protected]>
-%%%-------------------------------------------------------------------
+%%
+%% %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(erl2html2_SUITE).
 
 -compile(export_all).