Merge branch 'maint'

16 files changed, 704 insertions, 73 deletions

diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 0a77527b2f..63a8adbc63 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -64,7 +64,7 @@
 	 print/1, print/2, print/3,
 	 pal/1, pal/2, pal/3,
 	 capture_start/0, capture_stop/0, capture_get/0, capture_get/1,
-	 fail/1, fail/2, comment/1, comment/2,
+	 fail/1, fail/2, comment/1, comment/2, make_priv_dir/0,
 	 testcases/2, userdata/2, userdata/3,
 	 timetrap/1, get_timetrap_info/0, sleep/1]).
 
@@ -673,6 +673,15 @@ send_html_comment(Comment) ->
     ct_util:set_testdata({comment,Html}),
     test_server:comment(Html).
 
+%%%-----------------------------------------------------------------
+%%% @spec make_priv_dir() -> ok | {error,Reason}
+%%%      Reason = term()
+%%% @doc If the test has been started with the create_priv_dir 
+%%% option set to manual_per_tc, in order for the test case to use
+%%% the private directory, it must first create it by calling
+%%% this function.
+make_priv_dir() ->
+    test_server:make_priv_dir().
 
 %%%-----------------------------------------------------------------
 %%% @spec get_target_name(Handle) -> {ok,TargetName} | {error,Reason}
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index b2f669fefe..0cd9b5f7cb 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -920,33 +920,48 @@ insert_dir(D,[D1|Ds]) ->
 insert_dir(D,[]) ->
     [D].
 
-make_last_run_index([Name|Rest], Result, TotSucc, TotFail, UserSkip, AutoSkip,
-		    TotNotBuilt, Missing) ->
-    case last_test(Name) of
+make_last_run_index([Name|Rest], Result, TotSucc, TotFail,
+		    UserSkip, AutoSkip, TotNotBuilt, Missing) ->
+    case get_run_dirs(Name) of
 	false ->
 	    %% Silently skip.
-	    make_last_run_index(Rest, Result, TotSucc, TotFail, UserSkip, AutoSkip,
-				TotNotBuilt, Missing);
-	LastLogDir ->
+	    make_last_run_index(Rest, Result, TotSucc, TotFail,
+				UserSkip, AutoSkip, TotNotBuilt, Missing);
+	LogDirs ->
 	    SuiteName = filename:rootname(filename:basename(Name)),
-	    case make_one_index_entry(SuiteName, LastLogDir, "-", false, Missing) of
-		{Result1,Succ,Fail,USkip,ASkip,NotBuilt} ->
-		    %% for backwards compatibility
-		    AutoSkip1 = case catch AutoSkip+ASkip of
-				    {'EXIT',_} -> undefined;
-				    Res -> Res
-				end,
-		    make_last_run_index(Rest, [Result|Result1], TotSucc+Succ, 
-					TotFail+Fail, UserSkip+USkip, AutoSkip1,
-					TotNotBuilt+NotBuilt, Missing);
-		error ->
-		    make_last_run_index(Rest, Result, TotSucc, TotFail, UserSkip, AutoSkip, 
-					TotNotBuilt, Missing)
-	    end
+	    {Result1,TotSucc1,TotFail1,UserSkip1,AutoSkip1,TotNotBuilt1} = 
+		make_last_run_index1(SuiteName, LogDirs, Result,
+				     TotSucc, TotFail,
+				     UserSkip, AutoSkip,
+				     TotNotBuilt, Missing),
+	    make_last_run_index(Rest, Result1, TotSucc1, TotFail1,
+				UserSkip1, AutoSkip1,
+				TotNotBuilt1, Missing)
     end;
+
 make_last_run_index([], Result, TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt, _) ->
     {ok, [Result|total_row(TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt, false)],
      {TotSucc,TotFail,UserSkip,AutoSkip,TotNotBuilt}}.
+	    
+make_last_run_index1(SuiteName, [LogDir | LogDirs], Result, TotSucc, TotFail,
+		     UserSkip, AutoSkip, TotNotBuilt, Missing) ->
+    case make_one_index_entry(SuiteName, LogDir, "-", false, Missing) of
+	{Result1,Succ,Fail,USkip,ASkip,NotBuilt} ->
+	    %% for backwards compatibility
+	    AutoSkip1 = case catch AutoSkip+ASkip of
+			    {'EXIT',_} -> undefined;
+			    Res -> Res
+			end,
+	    make_last_run_index1(SuiteName, LogDirs, [Result|Result1], TotSucc+Succ, 
+				TotFail+Fail, UserSkip+USkip, AutoSkip1,
+				TotNotBuilt+NotBuilt, Missing);
+	error ->
+	    make_last_run_index1(SuiteName, LogDirs, Result, TotSucc, TotFail,
+				 UserSkip, AutoSkip, TotNotBuilt, Missing)
+    end;
+make_last_run_index1(_, [], Result, TotSucc, TotFail,
+		     UserSkip, AutoSkip, TotNotBuilt, _) ->
+    {Result,TotSucc,TotFail,UserSkip,AutoSkip,TotNotBuilt}.
 
 make_one_index_entry(SuiteName, LogDir, Label, All, Missing) ->
     case count_cases(LogDir) of
@@ -1698,8 +1713,8 @@ make_all_suites_index(NewTestData = {_TestName,DirName}) ->
 sort_logdirs([Dir|Dirs],Groups) ->
     TestName = filename:rootname(filename:basename(Dir)),
     case filelib:wildcard(filename:join(Dir,"run.*")) of
-	[RunDir] ->
-	    Groups1 = insert_test(TestName,{filename:basename(RunDir),RunDir},Groups),
+	RunDirs = [_|_] ->
+	    Groups1 = sort_logdirs1(TestName,RunDirs,Groups),
 	    sort_logdirs(Dirs,Groups1);
 	_ ->					% ignore missing run directory
 	    sort_logdirs(Dirs,Groups)
@@ -1707,6 +1722,12 @@ sort_logdirs([Dir|Dirs],Groups) ->
 sort_logdirs([],Groups) ->
     lists:keysort(1,sort_each_group(Groups)).
 
+sort_logdirs1(TestName,[RunDir|RunDirs],Groups) ->
+    Groups1 = insert_test(TestName,{filename:basename(RunDir),RunDir},Groups),
+    sort_logdirs1(TestName,RunDirs,Groups1);
+sort_logdirs1(_,[],Groups) ->
+    Groups.
+
 insert_test(Test,IxDir,[{Test,IxDirs}|Groups]) ->
     [{Test,[IxDir|IxDirs]}|Groups];
 insert_test(Test,IxDir,[]) ->
@@ -1998,21 +2019,17 @@ notify_and_unlock_file(File) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec last_test(Dir) -> string() | false
+%%% @spec get_run_dirs(Dir) -> [string()] | false
 %%%
 %%% @doc
 %%%
-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.
+get_run_dirs(Dir) ->
+    case filelib:wildcard(filename:join(Dir, "run.[1-2]*")) of
+	[] ->
+	    false;
+	RunDirs ->
+	    lists:sort(RunDirs)
+    end.
 
 %%%-----------------------------------------------------------------
 %%% @spec xhtml(HTML, XHTML) -> HTML | XHTML
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 45436392d8..666eb3c988 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -63,6 +63,7 @@
 	       stylesheet,
 	       multiply_timetraps = 1,
 	       scale_timetraps = false,
+	       create_priv_dir,
 	       testspecs = [],
 	       tests}).
 
@@ -178,6 +179,10 @@ script_start1(Parent, Args) ->
 			    fun([CT]) -> list_to_atom(CT);
 			       ([]) -> true
 			    end, false, Args),
+    CreatePrivDir = get_start_opt(create_priv_dir,
+				  fun([PD]) -> list_to_atom(PD);
+				     ([]) -> auto_per_tc
+				  end, Args),
     EvHandlers = event_handler_args2opts(Args),
     CTHooks = ct_hooks_args2opts(Args),
     EnableBuiltinHooks = get_start_opt(enable_builtin_hooks,
@@ -255,7 +260,8 @@ script_start1(Parent, Args) ->
 		     silent_connections = SilentConns,
 		     stylesheet = Stylesheet,
 		     multiply_timetraps = MultTT,
-		     scale_timetraps = ScaleTT},
+		     scale_timetraps = ScaleTT,
+		     create_priv_dir = CreatePrivDir},
 
     %% check if log files should be refreshed or go on to run tests...
     Result = run_or_refresh(StartOpts, Args),
@@ -322,12 +328,21 @@ script_start2(StartOpts = #opts{vts = undefined,
 
 			Cover = choose_val(StartOpts#opts.cover,
 					   SpecStartOpts#opts.cover),
-			MultTT = choose_val(StartOpts#opts.multiply_timetraps,
-					    SpecStartOpts#opts.multiply_timetraps),
-			ScaleTT = choose_val(StartOpts#opts.scale_timetraps,
-					     SpecStartOpts#opts.scale_timetraps),
-			AllEvHs = merge_vals([StartOpts#opts.event_handlers,
-					      SpecStartOpts#opts.event_handlers]),
+			MultTT =
+			    choose_val(StartOpts#opts.multiply_timetraps,
+				       SpecStartOpts#opts.multiply_timetraps),
+			ScaleTT =
+			    choose_val(StartOpts#opts.scale_timetraps,
+				       SpecStartOpts#opts.scale_timetraps),
+
+			CreatePrivDir =
+			    choose_val(StartOpts#opts.create_priv_dir,
+				       SpecStartOpts#opts.create_priv_dir),
+
+			AllEvHs = 
+			    merge_vals([StartOpts#opts.event_handlers,
+					SpecStartOpts#opts.event_handlers]),
+
 			AllCTHooks = merge_vals(
 					[StartOpts#opts.ct_hooks,
 					 SpecStartOpts#opts.ct_hooks]),
@@ -354,7 +369,8 @@ script_start2(StartOpts = #opts{vts = undefined,
 					       EnableBuiltinHooks,
 					   include = AllInclude,
 					   multiply_timetraps = MultTT,
-					   scale_timetraps = ScaleTT}}
+					   scale_timetraps = ScaleTT,
+					   create_priv_dir = CreatePrivDir}}
 		end;
 	    _ ->
 		{undefined,StartOpts}
@@ -567,6 +583,7 @@ script_usage() ->
 	      "\n\t[-no_auto_compile]"
 	      "\n\t[-multiply_timetraps N]"
 	      "\n\t[-scale_timetraps]"
+	      "\n\t[-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]"
 	      "\n\t[-basic_html]\n\n"),
     io:format("Run tests from command line:\n\n"
 	      "\tct_run [-dir TestDir1 TestDir2 .. TestDirN] |"
@@ -586,6 +603,7 @@ script_usage() ->
 	      "\n\t[-no_auto_compile]"
 	      "\n\t[-multiply_timetraps N]"
 	      "\n\t[-scale_timetraps]"
+	      "\n\t[-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]"
 	      "\n\t[-basic_html]"
 	      "\n\t[-repeat N [-force_stop]] |"
 	      "\n\t[-duration HHMMSS [-force_stop]] |"
@@ -606,6 +624,7 @@ script_usage() ->
 	      "\n\t[-no_auto_compile]"
 	      "\n\t[-multiply_timetraps N]"
 	      "\n\t[-scale_timetraps]"
+	      "\n\t[-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]"
 	      "\n\t[-basic_html]"
 	      "\n\t[-repeat N [-force_stop]] |"
 	      "\n\t[-duration HHMMSS [-force_stop]] |"
@@ -782,6 +801,9 @@ run_test2(StartOpts) ->
     MultiplyTT = get_start_opt(multiply_timetraps, value, 1, StartOpts),
     ScaleTT = get_start_opt(scale_timetraps, value, false, StartOpts),
 
+    %% create unique priv dir names
+    CreatePrivDir = get_start_opt(create_priv_dir, value, StartOpts),
+
     %% auto compile & include files
     Include =
 	case proplists:get_value(auto_compile, StartOpts) of
@@ -842,7 +864,8 @@ run_test2(StartOpts) ->
 		 silent_connections = SilentConns,
 		 stylesheet = Stylesheet,
 		 multiply_timetraps = MultiplyTT,
-		 scale_timetraps = ScaleTT},
+		 scale_timetraps = ScaleTT,
+		 create_priv_dir = CreatePrivDir},
 
     %% test specification
     case proplists:get_value(spec, StartOpts) of
@@ -889,6 +912,8 @@ run_spec_file(Relaxed,
 				SpecOpts#opts.multiply_timetraps),
 	    ScaleTT = choose_val(Opts#opts.scale_timetraps,
 				 SpecOpts#opts.scale_timetraps),
+	    CreatePrivDir = choose_val(Opts#opts.create_priv_dir,
+				       SpecOpts#opts.create_priv_dir),
 	    AllEvHs = merge_vals([Opts#opts.event_handlers,
 				  SpecOpts#opts.event_handlers]),
 	    AllInclude = merge_vals([Opts#opts.include,
@@ -912,6 +937,7 @@ run_spec_file(Relaxed,
 			      testspecs = AbsSpecs,
 			      multiply_timetraps = MultTT,
 			      scale_timetraps = ScaleTT,
+			      create_priv_dir = CreatePrivDir,
 			      ct_hooks = AllCTHooks,
 			      enable_builtin_hooks = EnableBuiltinHooks
 			     },
@@ -1170,7 +1196,8 @@ get_data_for_node(#testspec{label = Labels,
 			    enable_builtin_hooks = EnableBuiltinHooks,
 			    include = Incl,
 			    multiply_timetraps = MTs,
-			    scale_timetraps = STs}, Node) ->
+			    scale_timetraps = STs,
+			    create_priv_dir = PDs}, Node) ->
     Label = proplists:get_value(Node, Labels),
     Profile = proplists:get_value(Node, Profiles),
     LogDir = case proplists:get_value(Node, LogDirs) of
@@ -1184,6 +1211,7 @@ get_data_for_node(#testspec{label = Labels,
     Cover = proplists:get_value(Node, CoverFs),
     MT = proplists:get_value(Node, MTs),
     ST = proplists:get_value(Node, STs),
+    CreatePrivDir = proplists:get_value(Node, PDs),
     ConfigFiles = [{?ct_config_txt,F} || {N,F} <- Cfgs, N==Node] ++
 	[CBF || {N,CBF} <- UsrCfgs, N==Node],
     EvHandlers =  [{H,A} || {N,H,A} <- EvHs, N==Node],
@@ -1200,7 +1228,8 @@ get_data_for_node(#testspec{label = Labels,
 	  enable_builtin_hooks = EnableBuiltinHooks,
 	  include = Include,
 	  multiply_timetraps = MT,
-	  scale_timetraps = ST}.
+	  scale_timetraps = ST,
+	  create_priv_dir = CreatePrivDir}.
 
 refresh_logs(LogDir) ->
     {ok,Cwd} = file:get_cwd(),
@@ -1848,6 +1877,8 @@ do_run_test(Tests, Skip, Opts) ->
 	    test_server_ctrl:multiply_timetraps(Opts#opts.multiply_timetraps),
 	    test_server_ctrl:scale_timetraps(Opts#opts.scale_timetraps),
 
+	    test_server_ctrl:create_priv_dir(choose_val(Opts#opts.create_priv_dir,
+							auto_per_run)),
 	    ct_event:notify(#event{name=start_info,
 				   node=node(),
 				   data={NoOfTests,NoOfSuites,NoOfCases}}),
@@ -2447,6 +2478,10 @@ opts2args(EnvStartOpts) ->
 			  [{scale_timetraps,[]}];
 		     ({scale_timetraps,false}) ->
 			  [];
+		     ({create_priv_dir,auto_per_run}) ->
+			  [];
+		     ({create_priv_dir,PD}) when is_atom(PD) ->
+			  [{create_priv_dir,[atom_to_list(PD)]}];
 		     ({force_stop,true}) ->
 			  [{force_stop,[]}];
 		     ({force_stop,false}) ->
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index b68cbd3aa1..5b197c0c81 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -568,6 +568,21 @@ add_tests([{scale_timetraps,Node,ST}|Ts],Spec) ->
 add_tests([{scale_timetraps,ST}|Ts],Spec) ->
     add_tests([{scale_timetraps,all_nodes,ST}|Ts],Spec);
 
+%% --- create_priv_dir ---
+add_tests([{create_priv_dir,all_nodes,PD}|Ts],Spec) ->
+    Tests = lists:map(fun(N) -> {create_priv_dir,N,PD} end, list_nodes(Spec)),
+    add_tests(Tests++Ts,Spec);
+add_tests([{create_priv_dir,Nodes,PD}|Ts],Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,create_priv_dir,[PD],Ts,Spec#testspec.nodes),
+    add_tests(Ts1,Spec);
+add_tests([{create_priv_dir,Node,PD}|Ts],Spec) ->
+    PDs = Spec#testspec.create_priv_dir,
+    PDs1 = [{ref2node(Node,Spec#testspec.nodes),PD} |
+	    lists:keydelete(ref2node(Node,Spec#testspec.nodes),1,PDs)],
+    add_tests(Ts,Spec#testspec{create_priv_dir=PDs1});
+add_tests([{create_priv_dir,PD}|Ts],Spec) ->
+    add_tests([{create_priv_dir,all_nodes,PD}|Ts],Spec);
+
 %% --- config ---
 add_tests([{config,all_nodes,Files}|Ts],Spec) ->
     Tests = lists:map(fun(N) -> {config,N,Files} end, list_nodes(Spec)),
@@ -1158,7 +1173,8 @@ valid_terms() ->
      {skip_groups,6},
      {skip_groups,7},
      {skip_cases,5},
-     {skip_cases,6}
+     {skip_cases,6},
+     {create_priv_dir,2}
     ].
 
 %% this function "guesses" if the user has misspelled a term name
diff --git a/lib/common_test/src/ct_util.hrl b/lib/common_test/src/ct_util.hrl
index bde832811a..082599a9c6 100644
--- a/lib/common_test/src/ct_util.hrl
+++ b/lib/common_test/src/ct_util.hrl
@@ -43,9 +43,10 @@
 		   include=[],
 		   multiply_timetraps=[],
 		   scale_timetraps=[],
+		   create_priv_dir=[],
 		   alias=[],
 		   tests=[],
-		   merge_tests = true }).
+		   merge_tests=true}).
 
 -record(cover, {app=none,
 		level=details,
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index 284612b8f7..332c444145 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -29,6 +29,7 @@ MODULES= \
 	ct_test_support_eh \
 	ct_userconfig_callback \
 	ct_smoke_test_SUITE \
+	ct_priv_dir_SUITE \
 	ct_event_handler_SUITE \
 	ct_config_info_SUITE \
 	ct_groups_test_1_SUITE \
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index 053edba846..79ed51bc28 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -700,7 +700,7 @@ test_events(timetrap_end_conf) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{1,1,8}},
+     {?eh,start_info,{1,1,9}},
      {?eh,tc_start,{timetrap_1_SUITE,init_per_suite}},
      {?eh,tc_done,{timetrap_1_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{timetrap_1_SUITE,tc1}},
@@ -735,6 +735,10 @@ test_events(timetrap_end_conf) ->
      {?eh,tc_done,
       {timetrap_1_SUITE,tc8,{failed,{timetrap_timeout,1000}}}},
      {?eh,test_stats,{0,8,{0,0}}},
+     {?eh,tc_start,{timetrap_1_SUITE,tc9}},
+     {?eh,tc_done,
+      {timetrap_1_SUITE,tc9,{failed,{timetrap_timeout,1000}}}},
+     {?eh,test_stats,{0,9,{0,0}}},
      {?eh,tc_start,{timetrap_1_SUITE,end_per_suite}},
      {?eh,tc_done,{timetrap_1_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl
index faa0a7305c..a44ff6d0bc 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl
@@ -145,8 +145,17 @@ end_per_testcase1(tc8, Config) ->
     ct:pal("end_per_testcase(tc8): ~p", [Config]),
     tc8 = ?config(tc, Config),
     {failed,timetrap_timeout} = ?config(tc_status, Config),
+    ok;
+
+end_per_testcase1(tc9, Config) ->
+    ct:pal("end_per_testcase(tc9): ~p", [Config]),
+    tc9 = ?config(tc, Config),
+    %% check that it's possible to send and receive synchronously
+    %% with the group leader process for end_per_testcase
+    test_server:stop_node(dummy@somehost),
     ok.
 
+
 %%--------------------------------------------------------------------
 %% Function: groups() -> [Group]
 %% Group = {GroupName,Properties,GroupsAndTestCases}
@@ -170,7 +179,7 @@ groups() ->
 %% Reason = term()
 %%--------------------------------------------------------------------
 all() ->
-    [tc1, tc2, tc3, tc4, tc5, tc6, tc7, tc8].
+    [tc1, tc2, tc3, tc4, tc5, tc6, tc7, tc8, tc9].
 
 tc1(_) ->
     timer:sleep(2000),
@@ -205,6 +214,10 @@ tc8(_) ->
     timetrap_helper:sleep(2000),
     ok.
 
+tc9(_) ->
+    sleep(2000),
+    ok.
+
 %%%-----------------------------------------------------------------
 sleep(T) ->
     timer:sleep(T),
diff --git a/lib/common_test/test/ct_priv_dir_SUITE.erl b/lib/common_test/test/ct_priv_dir_SUITE.erl
new file mode 100644
index 0000000000..f6942d59bf
--- /dev/null
+++ b/lib/common_test/test/ct_priv_dir_SUITE.erl
@@ -0,0 +1,277 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2011. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_priv_dir_SUITE
+%%%
+%%% Description: 
+%%% Test that it works to use the create_priv_dir option.
+%%%
+%%%-------------------------------------------------------------------
+-module(ct_priv_dir_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [
+     default,
+     auto_per_run,
+     auto_per_tc,
+     manual_per_tc,
+     spec_default,
+     spec_auto_per_run,
+     spec_auto_per_run,
+     spec_manual_per_tc
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%% 
+default(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "priv_dir_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{testcase,default},
+			  {label,default}], Config),
+    ok = execute(default, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%% 
+auto_per_run(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "priv_dir_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{testcase,default},
+			  {label,auto_per_run},
+			  {create_priv_dir,auto_per_run}], Config),
+    ok = execute(auto_per_run, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%% 
+auto_per_tc(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "priv_dir_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{testcase,auto_per_tc},
+			  {label,auto_per_tc},
+			  {create_priv_dir,auto_per_tc}], Config),
+    ok = execute(auto_per_tc, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%% 
+manual_per_tc(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "priv_dir_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{testcase,manual_per_tc},
+			  {label,manual_per_tc},
+			  {create_priv_dir,manual_per_tc}], Config),
+    ok = execute(manual_per_tc, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%% 
+spec_default(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+    Spec = filename:join(DataDir, "default.spec"),
+    {Opts,ERPid} = setup([{spec,Spec},
+			  {label,spec_default}], Config),
+    ok = execute(spec_default, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%% 
+spec_auto_per_run(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+    Spec = filename:join(DataDir, "auto_per_run.spec"),
+    {Opts,ERPid} = setup([{spec,Spec},
+			  {label,spec_auto_per_run}], Config),
+    ok = execute(spec_auto_per_run, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%% 
+spec_auto_per_tc(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+    Spec = filename:join(DataDir, "auto_per_tc.spec"),
+    {Opts,ERPid} = setup([{spec,Spec},
+			  {label,spec_auto_per_tc}], Config),
+    ok = execute(spec_auto_per_tc, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%% 
+spec_manual_per_tc(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+    Spec = filename:join(DataDir, "manual_per_tc.spec"),
+    {Opts,ERPid} = setup([{spec,Spec},
+			  {label,spec_manual_per_tc}], Config),
+    ok = execute(spec_manual_per_tc, Opts, ERPid, Config).
+
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+execute(Name, Opts, ERPid, Config) ->
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(Name, 
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(Name),
+    ct_test_support:verify_events(TestEvents, Events, Config).
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+events_to_check(Test) ->
+    %% 2 tests (ct:run_test + script_start) is default
+    events_to_check(Test, 2).
+
+events_to_check(_, 0) ->
+    [];
+events_to_check(Test, N) ->
+    test_events(Test) ++ events_to_check(Test, N-1).
+
+
+test_events(DEF) when DEF == default ; DEF == auto_per_run ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,tc_start,{priv_dir_SUITE,init_per_suite}},
+     {?eh,tc_done,{priv_dir_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{priv_dir_SUITE,default}},
+     {?eh,tc_done,{priv_dir_SUITE,default,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{priv_dir_SUITE,end_per_suite}},
+     {?eh,tc_done,{priv_dir_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(auto_per_tc) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,tc_start,{priv_dir_SUITE,init_per_suite}},
+     {?eh,tc_done,{priv_dir_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{priv_dir_SUITE,auto_per_tc}},
+     {?eh,tc_done,{priv_dir_SUITE,auto_per_tc,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{priv_dir_SUITE,end_per_suite}},
+     {?eh,tc_done,{priv_dir_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(manual_per_tc) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,tc_start,{priv_dir_SUITE,init_per_suite}},
+     {?eh,tc_done,{priv_dir_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{priv_dir_SUITE,manual_per_tc}},
+     {?eh,tc_done,{priv_dir_SUITE,manual_per_tc,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{priv_dir_SUITE,end_per_suite}},
+     {?eh,tc_done,{priv_dir_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(SPECDEF) when SPECDEF == spec_default ;
+			  SPECDEF == spec_auto_per_run ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,tc_start,{priv_dir_SUITE,init_per_suite}},
+     {?eh,tc_done,{priv_dir_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{priv_dir_SUITE,default}},
+     {?eh,tc_done,{priv_dir_SUITE,default,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{priv_dir_SUITE,end_per_suite}},
+     {?eh,tc_done,{priv_dir_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(spec_auto_per_tc) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,tc_start,{priv_dir_SUITE,init_per_suite}},
+     {?eh,tc_done,{priv_dir_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{priv_dir_SUITE,auto_per_tc}},
+     {?eh,tc_done,{priv_dir_SUITE,auto_per_tc,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{priv_dir_SUITE,end_per_suite}},
+     {?eh,tc_done,{priv_dir_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(spec_manual_per_tc) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,tc_start,{priv_dir_SUITE,init_per_suite}},
+     {?eh,tc_done,{priv_dir_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{priv_dir_SUITE,manual_per_tc}},
+     {?eh,tc_done,{priv_dir_SUITE,manual_per_tc,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{priv_dir_SUITE,end_per_suite}},
+     {?eh,tc_done,{priv_dir_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}].
+
diff --git a/lib/common_test/test/ct_priv_dir_SUITE_data/auto_per_run.spec b/lib/common_test/test/ct_priv_dir_SUITE_data/auto_per_run.spec
new file mode 100644
index 0000000000..4dde0ed1f4
--- /dev/null
+++ b/lib/common_test/test/ct_priv_dir_SUITE_data/auto_per_run.spec
@@ -0,0 +1,5 @@
+{create_priv_dir, auto_per_run}.
+
+{alias, curr, "./"}.
+
+{cases, curr, priv_dir_SUITE, default}.
\ No newline at end of file
diff --git a/lib/common_test/test/ct_priv_dir_SUITE_data/auto_per_tc.spec b/lib/common_test/test/ct_priv_dir_SUITE_data/auto_per_tc.spec
new file mode 100644
index 0000000000..c265500865
--- /dev/null
+++ b/lib/common_test/test/ct_priv_dir_SUITE_data/auto_per_tc.spec
@@ -0,0 +1,5 @@
+{create_priv_dir, auto_per_tc}.
+
+{alias, curr, "./"}.
+
+{cases, curr, priv_dir_SUITE, auto_per_tc}.
\ No newline at end of file
diff --git a/lib/common_test/test/ct_priv_dir_SUITE_data/default.spec b/lib/common_test/test/ct_priv_dir_SUITE_data/default.spec
new file mode 100644
index 0000000000..2f053e792f
--- /dev/null
+++ b/lib/common_test/test/ct_priv_dir_SUITE_data/default.spec
@@ -0,0 +1,3 @@
+{alias, curr, "./"}.
+
+{cases, curr, priv_dir_SUITE, default}.
\ No newline at end of file
diff --git a/lib/common_test/test/ct_priv_dir_SUITE_data/manual_per_tc.spec b/lib/common_test/test/ct_priv_dir_SUITE_data/manual_per_tc.spec
new file mode 100644
index 0000000000..4f98734d5f
--- /dev/null
+++ b/lib/common_test/test/ct_priv_dir_SUITE_data/manual_per_tc.spec
@@ -0,0 +1,5 @@
+{create_priv_dir, manual_per_tc}.
+
+{alias, curr, "./"}.
+
+{cases, curr, priv_dir_SUITE, manual_per_tc}.
\ No newline at end of file
diff --git a/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl b/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl
new file mode 100644
index 0000000000..423cb2999b
--- /dev/null
+++ b/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl
@@ -0,0 +1,127 @@
+%%%-------------------------------------------------------------------
+%%% @author Peter Andersson <[email protected]>
+%%% @copyright (C) 2012, Peter Andersson
+%%% @doc
+%%%
+%%% @end
+%%% Created : 23 Jan 2012 by Peter Andersson <[email protected]>
+%%%-------------------------------------------------------------------
+-module(priv_dir_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% @spec suite() -> Info
+%% Info = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+%%--------------------------------------------------------------------
+%% @spec init_per_suite(Config0) ->
+%%     Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1} | {fail,Reason}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%% @end
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+all() -> 
+    [].
+
+default(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    "log_private" = filename:basename(PrivDir),
+    {ok,_} = file:list_dir(PrivDir).
+
+auto_per_tc(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    ["log_private",_] = string:tokens(filename:basename(PrivDir), "."),
+    {ok,_} = file:list_dir(PrivDir).
+
+manual_per_tc(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    ["log_private",_] = string:tokens(filename:basename(PrivDir), "."),
+    {error,_} = file:list_dir(PrivDir),
+    ok = ct:make_priv_dir(),
+    {ok,_} = file:list_dir(PrivDir).
+    
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 08197ee36e..d7ce432786 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -44,7 +44,7 @@
 -export([start_node/3, stop_node/1, wait_for_node/1, is_release_available/1]).
 -export([app_test/1, app_test/2]).
 -export([is_native/1]).
--export([comment/1]).
+-export([comment/1, make_priv_dir/0]).
 -export([os_type/0]).
 -export([run_on_shielded_node/2]).
 -export([is_cover/0,is_debug/0,is_commercial/0]).
@@ -754,6 +754,25 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
 	{set_curr_conf,From,NewCurrConf} ->
 	    From ! {self(),set_curr_conf,ok},
 	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,NewCurrConf);
+	{make_priv_dir,From} when CurrConf == undefined ->
+	    From ! {self(),make_priv_dir,{error,no_priv_dir_in_config}};
+	{make_priv_dir,From} ->
+	    Result =
+		case proplists:get_value(priv_dir, element(2, CurrConf)) of
+		    undefined ->
+			{error,no_priv_dir_in_config};
+		    PrivDir ->
+			case file:make_dir(PrivDir) of
+			    ok ->
+				ok;
+			    {error, eexist} ->
+				ok;
+			    MkDirError ->
+				{error,{MkDirError,PrivDir}}
+			end
+		end,
+	    From ! {self(),make_priv_dir,Result},
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
 	{'EXIT',Pid,{Ref,Time,Value,Loc,Opts}} ->
 	    RetVal = {Time/1000000,Value,mod_loc(Loc),Opts,Comment},
 	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},Comment,undefined);
@@ -948,17 +967,20 @@ output(Msg,Sender) ->
     local_or_remote_apply({test_server_ctrl,output,[Msg,Sender]}).
 
 call_end_conf(Mod,Func,TCPid,TCExitReason,Loc,Conf,TVal) ->
+    %% Starter is also the group leader process
     Starter = self(),
     Data = {Mod,Func,TCPid,TCExitReason,Loc},
     EndConfProc =
 	fun() ->
+		group_leader(Starter, self()),
 		Supervisor = self(),
 		EndConfApply =
 		    fun() ->
 			    case catch apply(Mod,end_per_testcase,[Func,Conf]) of
 				{'EXIT',Why} ->
+				    timer:sleep(1),
 				    group_leader() ! {printout,12,
-						      "ERROR! ~p:end_per_testcase(~p, ~p)"
+						      "WARNING! ~p:end_per_testcase(~p, ~p)"
 						      " crashed!\n\tReason: ~p\n",
 						      [Mod,Func,Conf,Why]};
 				_ ->
@@ -973,6 +995,11 @@ call_end_conf(Mod,Func,TCPid,TCExitReason,Loc,Conf,TVal) ->
 		    {'EXIT',Pid,Reason} ->
 			Starter ! {self(),{call_end_conf,Data,{error,Reason}}}
 		after TVal ->
+			exit(Pid, kill),
+			group_leader() ! {printout,12,
+					  "WARNING! ~p:end_per_testcase(~p, ~p)"
+					  " failed!\n\tReason: timetrap timeout"
+					  " after ~w ms!\n", [Mod,Func,Conf,TVal]},
 			Starter ! {self(),{call_end_conf,Data,{error,timeout}}}
 		end
 	end,
@@ -1027,6 +1054,10 @@ spawn_fw_call(Mod,{end_per_testcase,Func},EndConf,Pid,
 			    E = {failed,{Mod,end_per_testcase,Why}},
 			    {Result,E}
 		    end,
+		group_leader() ! {printout,12,
+				  "WARNING! ~p:end_per_testcase(~p, ~p)"
+				  " failed!\n\tReason: timetrap timeout"
+				  " after ~w ms!\n", [Mod,Func,EndConf,TVal]},
 		FailLoc = proplists:get_value(tc_fail_loc, EndConf1),
 		case catch do_end_tc_call(Mod,Func, FailLoc,
 					  {Pid,Report,[EndConf1]}, Why) of
@@ -1176,6 +1207,9 @@ run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
     exit({Ref,Time,Value,Loc,Opts}).
 
 run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
+    %% save current state in controller loop
+    sync_send(group_leader(),set_curr_conf,{{Mod,Func},hd(Args)},
+	      5000, fun() -> exit(no_answer_from_group_leader) end),
     case RunInit of
 	run_init ->
 	    put(test_server_init_or_end_conf,{init_per_testcase,Func}),
@@ -1234,8 +1268,8 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 		    %% call user callback function if defined
 		    EndConf1 = user_callback(TCCallback, Mod, Func, 'end', EndConf),
 		    %% update current state in controller loop
-		    sync_send(group_leader(),set_curr_conf,EndConf1,
-			      5000, fun() -> exit(no_answer_from_group_leader) end),
+		    sync_send(group_leader(),set_curr_conf,EndConf1, 5000,
+			      fun() -> exit(no_answer_from_group_leader) end),
 		    {FWReturn1,TSReturn1,EndConf2} =
 			case end_per_testcase(Mod, Func, EndConf1) of
 			    SaveCfg1={save_config,_} ->
@@ -2575,11 +2609,23 @@ read_comment() ->
     MsgLooper = group_leader(),
     MsgLooper ! {read_comment,self()},
     receive
-	{MsgLooper,read_comment,Comment} ->
-	    Comment
+	{MsgLooper,read_comment,Comment} -> Comment
+    after
+	5000 -> ""
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% make_priv_dir() -> ok
+%%
+%% Order test server to create the private directory
+%% for the current test case.
+make_priv_dir() ->
+    MsgLooper = group_leader(),
+    group_leader() ! {make_priv_dir,self()},
+    receive
+	{MsgLooper,make_priv_dir,Result} -> Result
     after
-	5000 ->
-	    ""
+	5000 -> error
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 4b649c3ec5..50720a45c8 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -164,6 +164,7 @@
 -export([start_get_totals/1, stop_get_totals/0]).
 -export([get_levels/0, set_levels/3]).
 -export([multiply_timetraps/1, scale_timetraps/1, get_timetrap_parameters/0]).
+-export([create_priv_dir/1]).
 -export([cover/2, cover/3, cover/7,
 	 cross_cover_analyse/1, cross_cover_analyse/2, trc/1, stop_trace/0]).
 -export([testcase_callback/1]).
@@ -219,8 +220,8 @@
 -define(user_skip_color, "#FF8000").
 
 -record(state,{jobs=[],levels={1,19,10},
-	       multiply_timetraps=1,scale_timetraps=true,
-	       finish=false,
+	       multiply_timetraps=1, scale_timetraps=true,
+	       create_priv_dir=auto_per_run, finish=false,
 	       target_info, trc=false, cover=false, wait_for_node=[],
 	       testcase_callback=undefined, idle_notify=[],
 	       get_totals=false, random_seed=undefined}).
@@ -506,6 +507,9 @@ scale_timetraps(Bool) ->
 get_timetrap_parameters() ->
     controller_call(get_timetrap_parameters).
 
+create_priv_dir(Value) ->
+    controller_call({create_priv_dir,Value}).
+
 trc(TraceFile) ->
     controller_call({trace,TraceFile}, 2*?ACCEPT_TIMEOUT).
 
@@ -811,6 +815,7 @@ handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
 			    [SpecName,{State#state.multiply_timetraps,
 				       State#state.scale_timetraps}],
 			    LogDir, Name, State#state.levels,
+			    State#state.create_priv_dir,
 			    State#state.testcase_callback, ExtraTools1),
 		    NewJobs = [{Name,Pid}|State#state.jobs],
 		    {reply, ok, State#state{jobs=NewJobs}};
@@ -820,6 +825,7 @@ handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
 			    [SpecList,{State#state.multiply_timetraps,
 				       State#state.scale_timetraps}],
 			    LogDir, Name, State#state.levels,
+			    State#state.create_priv_dir,
 			    State#state.testcase_callback, ExtraTools1),
 		    NewJobs = [{Name,Pid}|State#state.jobs],
 		    {reply, ok, State#state{jobs=NewJobs}};
@@ -837,6 +843,7 @@ handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
 				     {State#state.multiply_timetraps,
 				      State#state.scale_timetraps}],
 				    LogDir, Name, State#state.levels,
+				    State#state.create_priv_dir,
 				    State#state.testcase_callback, ExtraTools1),
 			    NewJobs = [{Name,Pid}|State#state.jobs],
 			    {reply, ok, State#state{jobs=NewJobs}}
@@ -1045,6 +1052,18 @@ handle_call({cover,App,Analyse}, _From, State) ->
     {reply,ok,State#state{cover={App,Analyse}}};
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% handle_call({create_priv_dir,Value}, _, State) -> ok | {error,Reason}
+%%
+%% Set create_priv_dir to either auto_per_run (create common priv dir once
+%% per test run), manual_per_tc (the priv dir name will be unique for each
+%% test case, but the user has to call test_server:make_priv_dir/0 to create
+%% it), or auto_per_tc (unique priv dir created automatically for each test
+%% case).
+
+handle_call({create_priv_dir,Value}, _From, State) ->
+    {reply,ok,State#state{create_priv_dir=Value}};
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% handle_call({testcase_callback,{Mod,Func}}, _, State) -> ok | {error,Reason}
 %%
 %% Add a callback function that will be called before and after every
@@ -1321,7 +1340,7 @@ kill_all_jobs([]) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% spawn_tester(Mod, Func, Args, Dir, Name, Levels,
+%% spawn_tester(Mod, Func, Args, Dir, Name, Levels, CreatePrivDir,
 %%              TestCaseCallback, ExtraTools) -> Pid
 %% Mod = atom()
 %% Func = atom()
@@ -1329,6 +1348,7 @@ kill_all_jobs([]) ->
 %% Dir = string()
 %% Name = string()
 %% Levels = {integer(),integer(),integer()}
+%% CreatePrivDir = auto_per_run | manual_per_tc | auto_per_tc
 %% TestCaseCallback = {CBMod,CBFunc} | undefined
 %% ExtraTools = [ExtraTool,...]
 %% ExtraTool = CoverInfo | TraceInfo | RandomSeed
@@ -1339,14 +1359,15 @@ kill_all_jobs([]) ->
 %% When the named function is done executing, a summary of the results
 %% is printed to the log files.
 
-spawn_tester(Mod, Func, Args, Dir, Name, Levels, TCCallback, ExtraTools) ->
+spawn_tester(Mod, Func, Args, Dir, Name, Levels, 
+	     CreatePrivDir, TCCallback, ExtraTools) ->
     spawn_link(
       fun() -> init_tester(Mod, Func, Args, Dir, Name, Levels,
-			   TCCallback, ExtraTools)
+			   CreatePrivDir, TCCallback, ExtraTools)
       end).
 
 init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev},
-	    TCCallback, ExtraTools) ->
+	    CreatePrivDir, TCCallback, ExtraTools) ->
     process_flag(trap_exit, true),
     put(test_server_name, Name),
     put(test_server_dir, Dir),
@@ -1357,6 +1378,7 @@ init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev},
     put(test_server_summary_level, SumLev),
     put(test_server_major_level, MajLev),
     put(test_server_minor_level, MinLev),
+    put(test_server_create_priv_dir, CreatePrivDir),
     put(test_server_random_seed, proplists:get_value(random_seed, ExtraTools)),
     put(test_server_testcase_callback, TCCallback),
     %% before first print, read and set logging options
@@ -1818,7 +1840,7 @@ do_test_cases(TopCase, SkipCases, Config, TimetrapSpec) ->
 %% Creates the log directories, the major log file and the html log file.
 %% The log files are initialized with some header information.
 %%
-%% The name of the log directory will be <Name>.LOGS/run.<Date>/ where
+%% The name of the log directory will be <Name>.logs/run.<Date>/ where
 %% Name is the test suite name and Date is the current date and time.
 
 start_log_file() ->
@@ -2754,7 +2776,15 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 					  {skipped,TcSkip},
 					  {failed,TcFail}]}]
 	       end,
-    TSDirs = [{priv_dir,get(test_server_priv_dir)},{data_dir,get_data_dir(Mod)}],
+
+    case get(test_server_create_priv_dir) of
+	auto_per_run ->				% use common priv_dir
+	    TSDirs = [{priv_dir,get(test_server_priv_dir)},
+		      {data_dir,get_data_dir(Mod)}];
+	_ ->
+	    TSDirs = [{data_dir,get_data_dir(Mod)}]
+    end,
+
     ActualCfg = 
 	if not StartConf ->
 		update_config(hd(Config), TSDirs ++ CfgProps);
@@ -2916,8 +2946,13 @@ run_test_cases_loop([{conf,_Ref,_Props,_X}=Conf|_Cases0],
 
 run_test_cases_loop([{Mod,Case}|Cases], Config, TimetrapData, Mode, Status) ->
     ActualCfg =
-	update_config(hd(Config), [{priv_dir,get(test_server_priv_dir)},
-				   {data_dir,get_data_dir(Mod)}]),
+    case get(test_server_create_priv_dir) of
+	auto_per_run ->
+	    update_config(hd(Config), [{priv_dir,get(test_server_priv_dir)},
+				       {data_dir,get_data_dir(Mod)}]);
+	_ ->
+	    update_config(hd(Config), [{data_dir,get_data_dir(Mod)}])
+    end,
     run_test_cases_loop([{Mod,Case,[ActualCfg]}|Cases], Config,
 			TimetrapData, Mode, Status);
 
@@ -3638,9 +3673,14 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
     %% if this runs on a parallel test case process,
     %% copy the dictionary from the main process
     do_if_parallel(Main, fun() -> process_flag(trap_exit, true) end, ok),
-    CopyDict = fun() -> lists:foreach(fun({Key,Val}) -> put(Key, Val) end, State) end,
+    CopyDict = fun() -> lists:foreach(fun({Key,Val}) ->
+					      put(Key, Val)
+				      end, State)
+	       end,
     do_if_parallel(Main, CopyDict, ok),
-    do_if_parallel(Main, fun() -> put(test_server_common_io_handler, {tc,Main}) end, ok),
+    do_if_parallel(Main, fun() -> 
+				 put(test_server_common_io_handler, {tc,Main})
+			 end, ok),
     %% if io is being buffered, send start io session message
     %% (no matter if case runs on parallel or main process)
     case get(test_server_common_io_handler) of
@@ -3660,8 +3700,35 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
     MinorBase = filename:basename(MinorName),
     print(major, "=logfile       ~s", [filename:basename(MinorName)]),
 
-    Args1 = [[{tc_logfile,MinorName} | proplists:delete(tc_logfile,hd(Args))]],
-    test_server_sup:framework_call(report, [tc_start,{{?pl2a(Mod),Func},MinorName}]),
+    UpdatedArgs =
+	%% maybe create unique private directory for test case or config func
+	case get(test_server_create_priv_dir) of
+	    auto_per_run ->
+		update_config(hd(Args), [{tc_logfile,MinorName}]);
+	    PrivDirMode ->
+		RunDir = filename:dirname(MinorName),
+		Ext =
+		    if Num == 0 ->
+			    {_,S,Us} = now(),
+			    lists:flatten(io_lib:format(".~w.~w", [S,Us]));
+		       true ->
+			    %% create unique private directory for test case
+			    RunDir = filename:dirname(MinorName),
+			    lists:flatten(io_lib:format(".~w", [Num]))
+		    end,
+		PrivDir = filename:join(RunDir, ?priv_dir) ++ Ext,
+		if PrivDirMode == auto_per_tc ->
+			ok = file:make_dir(PrivDir);
+		   PrivDirMode == manual_per_tc ->
+			ok
+		end,
+		update_config(hd(Args), [{priv_dir,PrivDir++"/"},
+					 {tc_logfile,MinorName}])
+	end,
+
+    test_server_sup:framework_call(report,
+				   [tc_start,{{?pl2a(Mod),Func},MinorName}]),
+
     print_props((RunInit==skip_init), get_props(Mode)),
     GroupName =	case get_name(Mode) of
 		    undefined -> "";
@@ -3680,7 +3747,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
     do_if_parallel(Main, ok, fun erlang:yield/0),
     %% run the test case
     {Result,DetectedFail,ProcsBefore,ProcsAfter} =
-	run_test_case_apply(Num, Mod, Func, Args1, get_name(Mode),
+	run_test_case_apply(Num, Mod, Func, [UpdatedArgs], get_name(Mode),
 			    RunInit, Where, TimetrapData),
     {Time,RetVal,Loc,Opts,Comment} =
 	case Result of