OTP-8311: Various updates and fixes in Common Test and Test Server

18 files changed, 2432 insertions, 22 deletions

diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 99e24205ae..f918f47415 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1996-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%
 %%
 -module(test_server).
@@ -760,6 +760,10 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment) ->
 		    spawn_fw_call(undefined,undefined,Pid,testcase_aborted_or_killed,
 				  unknown,self(),Comment),
 		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+		{fw_error,{FwMod,FwFunc,FwError}} ->
+		    spawn_fw_call(FwMod,FwFunc,Pid,{framework_error,FwError},
+				  unknown,self(),Comment),
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);		    
 		_ ->
 		    %% the testcase has terminated because of Reason (e.g. an exit
 		    %% because a linked process failed)
@@ -859,6 +863,22 @@ spawn_fw_call(Mod,{end_per_testcase,Func},Pid,{timetrap_timeout,TVal}=Why,
 			"</font>"]}}
 	end,
     spawn_link(FwCall);
+
+spawn_fw_call(FwMod,FwFunc,_Pid,{framework_error,FwError},_,SendTo,_Comment) ->
+    FwCall =
+	fun() ->
+		test_server_sup:framework_call(report, [framework_error,
+							{{FwMod,FwFunc},FwError}]),
+		Comment = 
+		    lists:flatten(
+		      io_lib:format("<font color=\"red\">"
+				    "WARNING! ~w:~w failed!</font>", [FwMod,FwFunc])),
+	    %% finished, report back
+	    SendTo ! {self(),fw_notify_done,
+		      {died,{error,{FwMod,FwFunc,FwError}},{FwMod,FwFunc},[],Comment}}
+	end,
+    spawn_link(FwCall);
+
 spawn_fw_call(Mod,Func,Pid,Error,Loc,SendTo,Comment) ->
     FwCall =
 	fun() ->
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 667d0cc051..4cb5863955 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2002-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%
 %%
 -module(test_server_ctrl).
diff --git a/lib/test_server/src/test_server_line.erl b/lib/test_server/src/test_server_line.erl
index 26ef3a3040..848a9c23dd 100644
--- a/lib/test_server/src/test_server_line.erl
+++ b/lib/test_server/src/test_server_line.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2004-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%
 %%
 -module(test_server_line).
@@ -347,6 +347,10 @@ munge_expr({'fun',Line,{clauses,Clauses}}, Vars) ->
     %% Only for Vsn=raw_abstract_v1
     {MungedClauses,Vars2}=munge_clauses(Clauses, Vars, []),
     {{'fun',Line,{clauses,MungedClauses}}, Vars2};
+munge_expr({bc,Line,Expr,LC}, Vars) ->
+    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
+    {MungedLC, Vars3} = munge_lc(LC, Vars2, []),
+    {{bc,Line,MungedExpr,MungedLC}, Vars3};
 munge_expr(Form, Vars) -> % var|char|integer|float|string|atom|nil|bin|eof
     {Form, Vars}.
 
@@ -363,6 +367,9 @@ munge_exprs([], Vars, MungedExprs) ->
 munge_lc([{generate,Line,Pattern,Expr}|LC], Vars, MungedLC) ->
     {MungedExpr, Vars2} = munge_expr(Expr, Vars),
     munge_lc(LC, Vars2, [{generate,Line,Pattern,MungedExpr}|MungedLC]);
+munge_lc([{b_generate,Line,Pattern,Expr}|LC], Vars, MungedLC) ->
+    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
+    munge_lc(LC, Vars2, [{b_generate,Line,Pattern,MungedExpr}|MungedLC]);
 munge_lc([Expr|LC], Vars, MungedLC) ->
     {MungedExpr, Vars2} = munge_expr(Expr, Vars),
     munge_lc(LC, Vars2, [MungedExpr|MungedLC]);
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index c665f185fd..89edb0f881 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1998-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%
 %%
 
@@ -497,7 +497,18 @@ framework_call(Callback,Func,Args,DefaultReturn) ->
     end,
     case erlang:function_exported(Mod,Func,length(Args)) of
 	true ->
-	    apply(Mod,Func,Args);
+	    EH = fun(Reason) -> exit({fw_error,{Mod,Func,Reason}}) end,
+	    try apply(Mod,Func,Args) of
+		Result ->
+		    Result
+	    catch
+		exit:Why ->
+		    EH(Why);
+		error:Why ->
+		    EH({Why,erlang:get_stacktrace()});
+		throw:Why ->
+		    EH(Why)
+	    end;
 	false ->
 	    DefaultReturn
     end.
diff --git a/lib/test_server/test/Makefile b/lib/test_server/test/Makefile
new file mode 100644
index 0000000000..702d73f5af
--- /dev/null
+++ b/lib/test_server/test/Makefile
@@ -0,0 +1,95 @@
+#
+# %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%
+#
+
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+MODULES= \
+	test_server_SUITE \
+	test_server_line_SUITE \
+	test_server_skip_SUITE \
+	test_server_conf01_SUITE \
+	test_server_conf02_SUITE \
+	test_server_parallel01_SUITE \
+	test_server_shuffle01_SUITE
+
+ERL_FILES= $(MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+INSTALL_PROGS= $(TARGET_FILES)
+
+EMAKEFILE=Emakefile
+COVERFILE=test_server.cover
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/test_server_test
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+
+ERL_MAKE_FLAGS += -pa $(ERL_TOP)/lib/test_server/ebin
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+
+EBIN = .
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+.PHONY: make_emakefile
+
+make_emakefile:
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) \
+	'*_SUITE_make' > $(EMAKEFILE)
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
+	>> $(EMAKEFILE)
+
+tests debug opt: make_emakefile
+	cd ../src && $(MAKE) ../ebin/test_server_line.beam
+	erl $(ERL_MAKE_FLAGS) -make
+
+clean:
+	rm -f $(EMAKEFILE)
+	rm -f $(TARGET_FILES) $(GEN_FILES)
+	rm -f core
+
+docs:
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+
+release_tests_spec: make_emakefile
+	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(COVERFILE) $(RELSYSDIR)
+	$(INSTALL_PROGRAM) test_server.spec $(RELSYSDIR)
+	chmod -f -R u+w $(RELSYSDIR)
+	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+
+release_docs_spec:
diff --git a/lib/test_server/test/test_server.cover b/lib/test_server/test/test_server.cover
new file mode 100644
index 0000000000..c2366db166
--- /dev/null
+++ b/lib/test_server/test/test_server.cover
@@ -0,0 +1,20 @@
+{exclude,[test_server,
+	  test_server_ctrl,
+	  ts_selftest]}.
+
+%% Using include list here because the test_server might not find
+%% lib_dir for test_server - and so it will not find which modules to
+%% compile.
+{include,[erl2html2,
+	  test_server_node,
+	  test_server_sup,
+	  ts,
+	  ts_autoconf_vxworks,
+	  ts_autoconf_win32,
+	  ts_erl_config,
+	  ts_install,
+	  ts_lib,
+	  ts_make,
+	  ts_run,
+	  vxworks_client]}.
+
diff --git a/lib/test_server/test/test_server.spec b/lib/test_server/test/test_server.spec
new file mode 100644
index 0000000000..23b0b71963
--- /dev/null
+++ b/lib/test_server/test/test_server.spec
@@ -0,0 +1,2 @@
+{topcase, {dir, "../test_server_test"}}.
+{skip,{test_server_SUITE,skip_case7,"This case should be noted as `Skipped'"}}.
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
new file mode 100644
index 0000000000..dfe1028d3a
--- /dev/null
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -0,0 +1,554 @@
+%%
+%% %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%
+%%
+
+%%%------------------------------------------------------------------
+%%% Test Server self test. 
+%%%------------------------------------------------------------------
+-module(test_server_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("test_server/include/test_server_line.hrl").
+-include_lib("kernel/include/file.hrl").
+-export([all/1]).
+
+-export([init_per_suite/1, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2, fin_per_testcase/2]).
+-export([config/1, comment/1, timetrap/1, timetrap_cancel/1, multiply_timetrap/1,
+	 init_per_s/1, init_per_tc/1, end_per_tc/1,
+	 timeconv/1, msgs/1, capture/1, timecall/1,
+	 do_times/1, do_times_mfa/1, do_times_fun/1,
+	 skip_cases/1, skip_case1/1, skip_case2/1, skip_case3/1, 
+	 skip_case4/1, skip_case5/1, skip_case6/1, skip_case7/1,
+	 skip_case8/1, skip_case9/1, undefined_functions/1,
+	 conf_init/1, check_new_conf/1, conf_cleanup/1,
+	 check_old_conf/1, conf_init_fail/1, start_stop_node/1,
+	 cleanup_nodes_init/1, check_survive_nodes/1, cleanup_nodes_fin/1,
+	 commercial/1]).
+
+-export([dummy_function/0,dummy_function/1,doer/1]).
+
+all(doc) -> ["Test Server self test"];
+all(suite) ->
+    [config, comment, timetrap, timetrap_cancel, multiply_timetrap,
+     init_per_s, init_per_tc, end_per_tc,
+     timeconv, msgs, capture, timecall, do_times, skip_cases,
+     undefined_functions, commercial,
+     {conf, conf_init, [check_new_conf], conf_cleanup},
+     check_old_conf,
+     {conf, conf_init_fail,[conf_member_skip],conf_cleanup_skip},
+     start_stop_node,
+     {conf, cleanup_nodes_init,[check_survive_nodes],cleanup_nodes_fin},
+     config
+    ].
+
+
+init_per_suite(Config) ->
+    [{init_per_suite_var,ok}|Config].
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
+    Dog = ?t:timetrap(?t:minutes(2)),
+    Config1 = [{watchdog, Dog}|Config],
+    case Func of
+	init_per_tc ->
+	    [{strange_var, 1}|Config1];
+	skip_case8 -> 
+	    {skipped, "This case should be noted as `Skipped'"};
+	skip_case9 ->
+	    {skip, "This case should be noted as `Skipped'"};
+	_ ->
+	    Config1
+    end;
+init_per_testcase(Func, Config) ->
+    io:format("Func:~p",[Func]),
+    io:format("Config:~p",[Config]),
+    ?t:fail("Arguments to init_per_testcase not correct").
+
+end_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
+    Dog=?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    case Func of
+	end_per_tc -> io:format("CLEANUP => this test case is ok\n");
+	_Other -> ok
+    end;
+end_per_testcase(Func, Config) ->
+    io:format("Func:~p",[Func]),
+    io:format("Config:~p",[Config]),
+    ?t:fail("Arguments to end_per_testcase not correct").
+
+fin_per_testcase(Func, Config) ->
+    io:format("Func:~p",[Func]),
+    io:format("Config:~p",[Config]),
+    ?t:fail("fin_per_testcase/2 called, should have called end_per_testcase/2").
+    
+
+config(suite) -> [];
+config(doc) -> ["Test that the Config variable is decent, ",
+		"and that the std config variables are correct ",
+		"(check that data/priv dir exists)."
+		"Also check that ?config macro works."];
+config(Config) when is_list(Config) ->
+    is_tuplelist(Config),
+    {value,{data_dir,Dd}}=lists:keysearch(data_dir,1,Config),
+    {value,{priv_dir,Dp}}=lists:keysearch(priv_dir,1,Config),
+    true=is_dir(Dd),
+    {ok, _Bin}=file:read_file(filename:join(Dd, "dummy_file")),
+    true=is_dir(Dp),
+
+    Dd = ?config(data_dir,Config),
+    Dp = ?config(priv_dir,Config),
+    ok;
+config(_Config) ->
+    ?t:fail("Config variable is not a list.").
+
+is_tuplelist([]) ->
+    true;
+is_tuplelist([{_A,_B}|Rest]) ->
+    is_tuplelist(Rest);
+is_tuplelist(_) ->
+    false.
+
+is_dir(Dir) ->
+    case file:read_file_info(Dir) of
+	{ok, #file_info{type=directory}} ->
+	    true;
+	_ ->
+	    false
+    end.
+
+comment(suite) -> [];
+comment(doc) -> ["Print a comment in the HTML log"];
+comment(Config) when is_list(Config) ->
+    ?t:comment("This comment should not occur in the HTML log because a later"
+	       " comment shall overwrite it"),
+    ?t:comment("This comment is printed with the comment/1 function."
+	       " It should occur in the HTML log").
+
+
+
+timetrap(suite) -> [];
+timetrap(doc) -> ["Test that timetrap works."];
+timetrap(Config) when is_list(Config) ->
+    TrapAfter = 3000,
+    Dog=?t:timetrap(TrapAfter),
+    process_flag(trap_exit, true),
+    TimeOut = TrapAfter * test_server:timetrap_scale_factor() + 1000,
+    receive
+	{'EXIT', Dog, {timetrap_timeout, _, _}} ->
+	    ok;
+	{'EXIT', _OtherPid, {timetrap_timeout, _, _}} ->
+	    ?t:fail("EXIT signal from wrong process")
+    after
+	TimeOut ->
+	    ?t:fail("Timetrap is not working.")
+    end,
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+
+timetrap_cancel(suite) -> [];
+timetrap_cancel(doc) -> ["Test that timetrap_cancel works."];
+timetrap_cancel(Config) when is_list(Config) ->
+    Dog=?t:timetrap(1000),
+    receive
+    after
+	500 ->
+	    ok
+    end,
+    ?t:timetrap_cancel(Dog),
+    receive
+    after 1000 ->
+	    ok
+    end,
+    ok.
+
+multiply_timetrap(suite) -> [];
+multiply_timetrap(doc) -> ["Test multiply timetrap"];
+multiply_timetrap(Config) when is_list(Config) ->
+    %% This simulates the call to test_server_ctrl:multiply_timetraps/1:
+    put(test_server_multiply_timetraps,2),
+
+    Dog = ?t:timetrap(500),
+    timer:sleep(800),
+    ?t:timetrap_cancel(Dog),
+
+    %% Reset
+    put(test_server_multiply_timetraps,1),
+    ok.
+
+
+init_per_s(suite) -> [];
+init_per_s(doc) -> ["Test that a Config that is altered in ",
+		     "init_per_suite gets through to the testcases."];
+init_per_s(Config) ->
+    %% Check that the config var sent from init_per_suite
+    %% really exists.
+    {value, {init_per_suite_var, ok}} = 
+	lists:keysearch(init_per_suite_var,1,Config),
+
+    %% Check that the other variables still exist.
+    {value,{data_dir,_Dd}}=lists:keysearch(data_dir,1,Config),
+    {value,{priv_dir,_Dp}}=lists:keysearch(priv_dir,1,Config),
+    ok.
+
+init_per_tc(suite) -> [];
+init_per_tc(doc) -> ["Test that a Config that is altered in ",
+		     "init_per_testcase gets through to the ",
+		     "actual testcase."];
+init_per_tc(Config) ->
+    %% Check that the config var sent from init_per_testcase
+    %% really exists.
+    {value, {strange_var, 1}} = lists:keysearch(strange_var,1,Config),
+
+    %% Check that the other variables still exist.
+    {value,{data_dir,_Dd}}=lists:keysearch(data_dir,1,Config),
+    {value,{priv_dir,_Dp}}=lists:keysearch(priv_dir,1,Config),
+    ok.
+
+end_per_tc(suite) -> [];
+end_per_tc(doc) -> ["Test that end_per_testcase/2 is called even if"
+		    " test case fails"];
+end_per_tc(Config) when is_list(Config) ->
+    ?t:fail("This case should fail! Check that \"CLEANUP\" is"
+	    " printed in the minor log file.").
+
+
+timeconv(suite) -> [];
+timeconv(doc) -> ["Test that the time unit conversion functions ",
+		  "works."];
+timeconv(Config) when is_list(Config) ->
+    Val=2,
+    Secs=Val*1000,
+    Mins=Secs*60,
+    Hrs=Mins*60,
+    Secs=?t:seconds(2),
+    Mins=?t:minutes(2),
+    Hrs=?t:hours(2),
+    ok.
+
+
+msgs(suite) -> [];
+msgs(doc) -> ["Tests the messages_get function."];
+msgs(Config) when is_list(Config) ->
+    self() ! {hej, du},
+    self() ! {lite, "data"},
+    self() ! en_atom,
+    [{hej, du}, {lite, "data"}, en_atom] = ?t:messages_get(),
+    ok.
+
+capture(suite) -> [];
+capture(doc) -> ["Test that the capture functions work properly."];
+capture(Config) when is_list(Config) ->
+    String1="abcedfghjiklmnopqrstuvwxyz",
+    String2="0123456789",
+    ?t:capture_start(),
+    io:format(String1),
+    [String1]=?t:capture_get(),
+    io:format(String2),
+    [String2]=?t:capture_get(),
+    ?t:capture_stop(),
+    []=?t:capture_get(),
+    io:format(String2),
+    []=?t:capture_get(),
+    ok.
+
+timecall(suite) -> [];
+timecall(doc) -> ["Tests that timed calls work."];
+timecall(Config) when is_list(Config) ->
+    {_Time1, liten_apa_e_oxo_farlig} = ?t:timecall(?MODULE, dummy_function, []),
+    {Time2, jag_ar_en_gorilla} = ?t:timecall(?MODULE, dummy_function, [gorilla]),
+    DTime=round(Time2),
+    if
+	DTime<1 ->
+	    ?t:fail("Timecall reported a too low time.");
+	DTime==1 ->
+	    ok;
+	DTime>1 ->
+	    ?t:fail("Timecall reported a too high time.")
+    end,
+    ok.
+
+dummy_function() ->
+    liten_apa_e_oxo_farlig.
+dummy_function(gorilla) ->
+    receive after 1000 -> ok end,
+    jag_ar_en_gorilla.
+
+
+do_times(suite) -> [do_times_mfa, do_times_fun];
+do_times(doc) -> ["Test the do_times function."].
+
+do_times_mfa(suite) -> [];
+do_times_mfa(doc) -> ["Test the do_times function with M,F,A given."];
+do_times_mfa(Config) when is_list(Config) ->
+    ?t:do_times(100, ?MODULE, doer, [self()]),
+    100=length(?t:messages_get()),
+    ok.
+
+do_times_fun(suite) -> [];
+do_times_fun(doc) -> ["Test the do_times function with fun given."];
+do_times_fun(Config) when is_list(Config) ->
+    Self = self(),
+    ?t:do_times(100, fun() -> doer(Self) end),
+    100=length(?t:messages_get()),
+    ok.
+
+doer(From) ->
+    From ! a,
+    ok.
+
+skip_cases(doc) -> ["Test all possible ways to skip a test case."];
+skip_cases(suite) -> [skip_case1, skip_case2, skip_case3, skip_case4,
+		      skip_case5, skip_case6, skip_case7, skip_case8,
+		      skip_case9].
+
+skip_case1(suite) -> [];
+skip_case1(doc) -> ["Test that you can return {skipped, Reason},"
+		    " and that Reason is in the comment field in the HTML log"];
+skip_case1(Config) when is_list(Config) ->
+    %% If this comment shows, the case failed!!
+    ?t:comment("ERROR: This case should have been noted as `Skipped'"),
+    %% The Reason in {skipped, Reason} should overwrite a 'comment'
+    {skipped, "This case should be noted as `Skipped'"}.
+
+skip_case2(suite) -> [];
+skip_case2(doc) -> ["Test that you can return {skipped, Reason},"
+		    " and that Reason is in the comment field in the HTML log"];
+skip_case2(Config) when is_list(Config) ->
+    %% If this comment shows, the case failed!!
+    ?t:comment("ERROR: This case should have been noted as `Skipped'"),
+    %% The Reason in {skipped, Reason} should overwrite a 'comment'
+    exit({skipped, "This case should be noted as `Skipped'"}).    
+
+skip_case3(suite) -> [];
+skip_case3(doc) -> ["Test that you can return {skip, Reason},"
+		    " and that Reason is in the comment field in the HTML log"];
+skip_case3(Config) when is_list(Config) ->
+    %% If this comment shows, the case failed!!
+    ?t:comment("ERROR: This case should have been noted as `Skipped'"),
+    %% The Reason in {skip, Reason} should overwrite a 'comment'
+    {skip, "This case should be noted as `Skipped'"}.
+
+skip_case4(suite) -> [];
+skip_case4(doc) -> ["Test that you can return {skip, Reason},"
+		    " and that Reason is in the comment field in the HTML log"];
+skip_case4(Config) when is_list(Config) ->
+    %% If this comment shows, the case failed!!
+    ?t:comment("ERROR: This case should have been noted as `Skipped'"),
+    %% The Reason in {skip, Reason} should overwrite a 'comment'
+    exit({skip, "This case should be noted as `Skipped'"}).    
+
+skip_case5(suite) -> {skipped, "This case should be noted as `Skipped'"};
+skip_case5(doc) -> ["Test that you can return {skipped, Reason}"
+		    " from the specification clause"].
+
+skip_case6(suite) -> {skip, "This case should be noted as `Skipped'"};
+skip_case6(doc) -> ["Test that you can return {skip, Reason}"
+		    " from the specification clause"].
+
+skip_case7(suite) -> [];
+skip_case7(doc) -> ["Test that skip works from a test specification file"];
+skip_case7(Config) when is_list(Config) ->
+    %% This case shall be skipped by adding 
+    %% {skip, {test_server_SUITE, skip_case7, Reason}}. 
+    %% to the test specification file.
+    ?t:fail("This case should have been Skipped by the .spec file").
+
+skip_case8(suite) -> [];
+skip_case8(doc) -> ["Test that {skipped, Reason} works from"
+		    " init_per_testcase/2"];
+skip_case8(Config) when is_list(Config) ->
+    %% This case shall be skipped by adding a specific clause to 
+    %% returning {skipped, Reason} from init_per_testcase/2 for this case. 
+    ?t:fail("This case should have been Skipped by init_per_testcase/2").
+
+skip_case9(suite) -> [];
+skip_case9(doc) -> ["Test that {skip, Reason} works from a init_per_testcase/2"];
+skip_case9(Config) when is_list(Config) ->
+    %% This case shall be skipped by adding a specific clause to 
+    %% returning {skip, Reason} from init_per_testcase/2 for this case. 
+    ?t:fail("This case should have been Skipped by init_per_testcase/2").
+
+undefined_functions(suite) -> [];
+undefined_functions(doc) -> ["Check for calls to undefined functions in"
+			     " test_server."
+			     "Skip if cover is running"];
+undefined_functions(Config) when is_list(Config) ->
+    case whereis(cover_server) of
+	Pid when is_pid(Pid) -> 
+	    {skip,"Cover is running"};
+	undefined -> 
+	    undefined_functions()
+    end.
+
+undefined_functions() ->
+    TestServerDir = filename:dirname(code:which(test_server)),
+    Res = xref:d(TestServerDir),
+    
+    {value,{unused,Unused}} = lists:keysearch(unused, 1, Res),
+    case Unused of
+	[] -> ok;
+	_ ->
+	    lists:foreach(fun (MFA) ->
+				  io:format("~s unused", [format_mfa(MFA)])
+			  end, Unused)
+    end,
+    
+    {value,{undefined,Undef0}} = lists:keysearch(undefined, 1, Res),
+    Undef = [U || U <- Undef0, not unresolved(U)],
+    case Undef of
+	[] -> ok;
+	_ ->
+	    lists:foreach(fun ({MFA1,MFA2}) ->
+				  io:format("~s calls undefined ~s",
+					    [format_mfa(MFA1),format_mfa(MFA2)])
+			  end, Undef),
+	    ?t:fail({length(Undef),undefined_functions_in_otp})
+    end,
+    ok.
+
+unresolved({_,{_,'$F_EXPR',_}}) -> true;
+unresolved(_) -> false.
+
+format_mfa({M,F,A}) ->
+    lists:flatten(io_lib:format("~s:~s/~p", [M,F,A])).
+
+conf_init(doc) -> ["Test successful conf case: Change Config parameter"];
+conf_init(Config) when is_list(Config) ->
+    [{conf_init_var,1389}|Config].
+
+check_new_conf(suite) -> [];
+check_new_conf(doc) -> ["Check that Config parameter changed by"
+			" conf_init is used"];
+check_new_conf(Config) when is_list(Config) ->
+    1389 = ?config(conf_init_var,Config),
+    ok.
+
+conf_cleanup(doc) -> ["Test successful conf case: Restore Config parameter"];
+conf_cleanup(Config) when is_list(Config) ->
+    lists:keydelete(conf_init_var,1,Config).
+
+check_old_conf(suite) -> [];
+check_old_conf(doc) -> ["Test that the restored Config is used after a"
+			" conf cleanup"];
+check_old_conf(Config) when is_list(Config) ->
+    undefined = ?config(conf_init_var,Config),
+    ok.
+
+conf_init_fail(doc) -> ["Test that config members are skipped if"
+			" conf init function fails."];
+conf_init_fail(Config) when is_list(Config) -> 
+    ?t:fail("This case should fail! Check that conf_member_skip and"
+	    " conf_cleanup_skip are skipped.").
+
+
+
+start_stop_node(suite) -> [];
+start_stop_node(doc) -> ["Test start and stop of slave and peer nodes"];
+start_stop_node(Config) when is_list(Config) ->
+    {ok,Node2} = ?t:start_node(node2,peer,[]),
+    {error, _} = ?t:start_node(node2,peer,[{fail_on_error,false}]),
+    true = lists:member(Node2,nodes()),
+
+    {ok,Node3} = ?t:start_node(node3,slave,[]),
+    {error, _} = ?t:start_node(node3,slave,[]),
+    true = lists:member(Node3,nodes()),
+
+    {ok,Node4} = ?t:start_node(node4,peer,[{wait,false}]),
+    case lists:member(Node4,nodes()) of
+	true -> 
+	    ?t:comment("WARNING: Node started with {wait,false}"
+			     " is up faster than expected...");
+	false ->
+	    wait_for_node(Node4,0),
+	    true = lists:member(Node4,nodes())
+    end,
+
+    true = ?t:stop_node(Node2),
+    false = lists:member(Node2,nodes()),
+
+    true = ?t:stop_node(Node3),
+    false = lists:member(Node3,nodes()),
+    
+    true = ?t:stop_node(Node4),
+    false = lists:member(Node4,nodes()),
+    timer:sleep(2000),
+    false = ?t:stop_node(Node4),
+
+    ok.
+
+
+wait_for_node(Node,Acc) ->
+    case net_adm:ping(Node) of
+	pang -> 
+	    timer:sleep(100),
+	    wait_for_node(Node,Acc+100);
+	pong ->
+	    Acc
+    end.
+
+cleanup_nodes_init(doc) -> ["Test that nodes are terminated when test case"
+			    " is finished unless {cleanup,false} is given."];
+cleanup_nodes_init(Config) when is_list(Config) ->
+    {ok,DieSlave} = ?t:start_node(die_slave, slave, []),
+    {ok,SurviveSlave} = ?t:start_node(survive_slave, slave, [{cleanup,false}]),
+    {ok,DiePeer} = ?t:start_node(die_peer, peer, []),
+    {ok,SurvivePeer} = ?t:start_node(survive_peer, peer, [{cleanup,false}]),
+    [{die_slave,DieSlave},
+     {survive_slave,SurviveSlave},
+     {die_peer,DiePeer},
+     {survive_peer,SurvivePeer} | Config].
+
+
+
+check_survive_nodes(suite) -> [];
+check_survive_nodes(doc) -> ["Test that nodes with {cleanup,false} survived"];
+check_survive_nodes(Config) when is_list(Config) ->
+    timer:sleep(1000),
+    false = lists:member(?config(die_slave,Config),nodes()),
+    true = lists:member(?config(survive_slave,Config),nodes()),
+    false = lists:member(?config(die_peer,Config),nodes()),
+    true = lists:member(?config(survive_peer,Config),nodes()),
+    ok.
+
+
+cleanup_nodes_fin(doc) -> ["Test that nodes started with {cleanup,false}"
+			   " can be stopped"];
+cleanup_nodes_fin(Config) when is_list(Config) ->
+    Slave = ?config(survive_slave,Config),
+    Peer = ?config(survive_peer,Config),
+    
+    true = ?t:stop_node(Slave),
+    false = lists:member(Slave,nodes()),
+    true = ?t:stop_node(Peer),
+    false = lists:member(Peer,nodes()),
+    
+    C1 = lists:keydelete(die_slave,1,Config),
+    C2 = lists:keydelete(survive_slave,1,C1),
+    C3 = lists:keydelete(die_peer,1,C2),
+    lists:keydelete(survive_peer,1,C3).
+
+commercial(Config) when is_list(Config) ->
+    case ?t:is_commercial() of
+	false -> {comment,"Open-source build"};
+	true -> {comment,"Commercial build"}
+    end.
+
+	    
diff --git a/lib/test_server/test/test_server_SUITE_data/dummy_file b/lib/test_server/test/test_server_SUITE_data/dummy_file
new file mode 100644
index 0000000000..65c88fbd75
--- /dev/null
+++ b/lib/test_server/test/test_server_SUITE_data/dummy_file
@@ -0,0 +1 @@
+Dummy file.
\ No newline at end of file
diff --git a/lib/test_server/test/test_server_conf01_SUITE.erl b/lib/test_server/test/test_server_conf01_SUITE.erl
new file mode 100644
index 0000000000..a6d7dfe851
--- /dev/null
+++ b/lib/test_server/test/test_server_conf01_SUITE.erl
@@ -0,0 +1,187 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-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%
+%%
+
+%%%------------------------------------------------------------------
+%%% Test Server self test. 
+%%%------------------------------------------------------------------
+-module(test_server_conf01_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+-compile(export_all).
+
+all(doc) -> ["Test simple conf case structure, with and without nested cases"];
+all(suite) -> 
+    [
+     {conf, conf1_init, [conf1_tc1, conf1_tc2], conf1_end},
+
+     {conf, [], conf2_init, [conf2_tc1, conf2_tc2], conf2_end},
+
+     {conf, conf3_init, [conf3_tc1, 
+
+			 {conf, [], conf4_init, [conf4_tc1, conf4_tc2], conf4_end},
+
+			 conf3_tc2], conf3_end},
+
+     conf5 
+    ].
+
+%%---------- conf cases ----------
+
+conf1_init(Config) when is_list(Config) ->
+    [{cc1,conf1}|Config].
+conf1_end(_Config) ->
+    ok.
+
+conf2_init(Config) when is_list(Config) ->
+    [{cc2,conf2}|Config].
+conf2_end(_Config) ->
+    ok.
+
+conf3_init(Config) when is_list(Config) ->
+    [{cc3,conf3}|Config].
+conf3_end(_Config) ->
+    ok.
+
+conf4_init(Config) when is_list(Config) ->
+    [{cc4,conf4}|Config].
+conf4_end(_Config) ->
+    ok.
+
+conf5_init(Config) when is_list(Config) ->
+    [{cc5,conf5}|Config].
+conf5_end(_Config) ->
+    ok.
+
+conf6_init(Config) when is_list(Config) ->
+    [{cc6,conf6}|Config].
+conf6_end(_Config) ->
+    ok.
+
+
+conf5(suite) ->					% test specification
+    [{conf, conf5_init, [conf5_tc1, 
+
+			 {conf, [], conf6_init, [conf6_tc1, conf6_tc2], conf6_end},
+
+			 conf5_tc2], conf5_end}].
+
+
+%%---------- test cases ----------
+
+conf1_tc1(Config) when is_list(Config) ->
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    conf1 = ?config(cc1,Config),
+    ok.
+conf1_tc2(Config) when is_list(Config) ->
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf1 = ?config(cc1,Config),
+    ok.
+
+conf2_tc1(Config) when is_list(Config) ->
+    undefined = ?config(cc1,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    conf2 = ?config(cc2,Config),
+    ok.
+conf2_tc2(Config) when is_list(Config) ->
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf2 = ?config(cc2,Config),
+    ok.
+
+conf3_tc1(Config) when is_list(Config) ->
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    conf3 = ?config(cc3,Config),
+    ok.
+conf3_tc2(Config) when is_list(Config) ->
+    conf3 = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    ok.
+
+conf4_tc1(Config) when is_list(Config) ->
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    conf3 = ?config(cc3,Config),
+    conf4 = ?config(cc4,Config),
+    ok.
+conf4_tc2(Config) when is_list(Config) ->
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf3 = ?config(cc3,Config),
+    conf4 = ?config(cc4,Config),
+    ok.
+
+conf5_tc1(Config) when is_list(Config) ->
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    conf5 = ?config(cc5,Config),
+    ok.
+conf5_tc2(Config) when is_list(Config) ->
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf5 = ?config(cc5,Config),
+    undefined = ?config(cc6,Config),
+    ok.
+
+conf6_tc1(Config) when is_list(Config) ->
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    conf5 = ?config(cc5,Config),
+    conf6 = ?config(cc6,Config),
+    ok.
+conf6_tc2(Config) when is_list(Config) ->
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf5 = ?config(cc5,Config),
+    conf6 = ?config(cc6,Config),
+    ok.
+    
diff --git a/lib/test_server/test/test_server_conf02_SUITE.erl b/lib/test_server/test/test_server_conf02_SUITE.erl
new file mode 100644
index 0000000000..deba4660c6
--- /dev/null
+++ b/lib/test_server/test/test_server_conf02_SUITE.erl
@@ -0,0 +1,294 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-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%
+%%
+
+%%%------------------------------------------------------------------
+%%% Test Server self test. 
+%%%------------------------------------------------------------------
+-module(test_server_conf02_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+-compile(export_all).
+
+all(doc) -> ["Test simple conf case structure, with and without nested cases"];
+all(suite) -> 
+    [
+     {conf, conf1_init, [conf1_tc1, conf1_tc2], conf1_end},
+
+     {conf, [], conf2_init, [conf2_tc1, conf2_tc2], conf2_end},
+
+     {conf, conf3_init, [conf3_tc1, 
+
+			 {conf, [], conf4_init, [conf4_tc1, conf4_tc2], conf4_end},
+
+			 conf3_tc2], conf3_end},
+
+     conf5 
+    ].
+
+
+%%---------- conf cases ----------
+
+init_per_suite(Config) ->
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    [{suite,init}|Config].
+end_per_suite(Config) ->
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    init = ?config(suite,Config),
+    ok.
+
+init_per_testcase(TC=conf1_tc1, Config) ->
+    init = ?config(suite,Config),
+    [{tc11,TC}|Config];
+init_per_testcase(TC=conf1_tc2, Config) ->
+    [{tc12,TC}|Config];
+init_per_testcase(TC=conf2_tc1, Config) ->
+    [{tc21,TC}|Config];
+init_per_testcase(TC=conf2_tc2, Config) ->
+    [{tc22,TC}|Config];
+init_per_testcase(TC=conf3_tc1, Config) ->
+    [{tc31,TC}|Config];
+init_per_testcase(TC=conf3_tc2, Config) ->
+    [{tc32,TC}|Config];
+init_per_testcase(TC=conf4_tc1, Config) ->
+    [{tc41,TC}|Config];
+init_per_testcase(TC=conf4_tc2, Config) ->
+    [{tc42,TC}|Config];
+init_per_testcase(TC=conf5_tc1, Config) ->
+    [{tc51,TC}|Config];
+init_per_testcase(TC=conf5_tc2, Config) ->
+    [{tc52,TC}|Config];
+init_per_testcase(TC=conf6_tc1, Config) ->
+    [{tc61,TC}|Config];
+init_per_testcase(TC=conf6_tc2, Config) ->
+    init = ?config(suite,Config),
+    [{tc62,TC}|Config].
+
+end_per_testcase(TC=conf1_tc1, Config) ->
+    init = ?config(suite,Config),
+    TC = ?config(tc11,Config),
+    ok;
+end_per_testcase(TC=conf1_tc2, Config) ->
+    TC = ?config(tc12,Config),
+    ok;
+end_per_testcase(TC=conf2_tc1, Config) ->
+    TC = ?config(tc21,Config),
+    ok;
+end_per_testcase(TC=conf2_tc2, Config) ->
+    TC = ?config(tc22,Config),
+    ok;
+end_per_testcase(TC=conf3_tc1, Config) ->
+    TC = ?config(tc31,Config),
+    ok;
+end_per_testcase(TC=conf3_tc2, Config) ->
+    TC = ?config(tc32,Config),
+    ok;
+end_per_testcase(TC=conf4_tc1, Config) ->
+    TC = ?config(tc41,Config),
+    ok;
+end_per_testcase(TC=conf4_tc2, Config) ->
+    TC = ?config(tc42,Config),
+    ok;
+end_per_testcase(TC=conf5_tc1, Config) ->
+    TC = ?config(tc51,Config),
+    ok;
+end_per_testcase(TC=conf5_tc2, Config) ->
+    TC = ?config(tc52,Config),
+    ok;
+end_per_testcase(TC=conf6_tc1, Config) ->
+    TC = ?config(tc61,Config),
+    ok;
+end_per_testcase(TC=conf6_tc2, Config) ->
+    init = ?config(suite,Config),
+    TC = ?config(tc62,Config),
+    ok.
+
+conf1_init(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    [{cc1,conf1}|Config].
+conf1_end(_Config) ->
+    ok.
+
+conf2_init(Config) when is_list(Config) ->
+    [{cc2,conf2}|Config].
+conf2_end(_Config) ->
+    ok.
+
+conf3_init(Config) when is_list(Config) ->
+    [{cc3,conf3}|Config].
+conf3_end(_Config) ->
+    ok.
+
+conf4_init(Config) when is_list(Config) ->
+    [{cc4,conf4}|Config].
+conf4_end(_Config) ->
+    ok.
+
+conf5_init(Config) when is_list(Config) ->
+    [{cc5,conf5}|Config].
+conf5_end(_Config) ->
+    ok.
+
+conf6_init(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    [{cc6,conf6}|Config].
+conf6_end(_Config) ->
+    ok.
+
+conf5(suite) ->					% test specification
+    [{conf, conf5_init, [conf5_tc1, 
+
+			 {conf, [], conf6_init, [conf6_tc1, conf6_tc2], conf6_end},
+
+			 conf5_tc2], conf5_end}].
+
+%%---------- test cases ----------
+
+conf1_tc1(Config) when is_list(Config) ->
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    init = ?config(suite,Config),
+    conf1 = ?config(cc1,Config),
+    conf1_tc1 = ?config(tc11,Config),
+    ok.
+conf1_tc2(Config) when is_list(Config) ->
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    init = ?config(suite,Config),
+    conf1 = ?config(cc1,Config),
+    conf1_tc2 = ?config(tc12,Config),
+    ok.
+
+conf2_tc1(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(cc1,Config),
+    undefined = ?config(tc11,Config),
+    conf2 = ?config(cc2,Config),
+    conf2_tc1 = ?config(tc21,Config),
+    ok.
+conf2_tc2(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    conf2 = ?config(cc2,Config),
+    undefined = ?config(tc21,Config),
+    conf2_tc2 = ?config(tc22,Config),
+    ok.
+
+conf3_tc1(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(tc22,Config),
+    conf3 = ?config(cc3,Config),
+    conf3_tc1 = ?config(tc31,Config),
+    ok.
+conf3_tc2(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    conf3 = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    undefined = ?config(tc31,Config),
+    undefined = ?config(tc41,Config),
+    conf3_tc2 = ?config(tc32,Config),
+    ok.
+
+conf4_tc1(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    conf3 = ?config(cc3,Config),
+    conf4 = ?config(cc4,Config),
+    undefined = ?config(tc32,Config),
+    conf4_tc1 = ?config(tc41,Config),
+    ok.
+conf4_tc2(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf3 = ?config(cc3,Config),
+    conf4 = ?config(cc4,Config),
+    undefined = ?config(tc41,Config),
+    conf4_tc2 = ?config(tc42,Config),
+    ok.
+
+conf5_tc1(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    conf5 = ?config(cc5,Config),
+    undefined = ?config(tc42,Config),
+    conf5_tc1 = ?config(tc51,Config),
+    ok.
+conf5_tc2(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf5 = ?config(cc5,Config),
+    undefined = ?config(cc6,Config),
+    undefined = ?config(tc51,Config),
+    undefined = ?config(tc62,Config),
+    conf5_tc2 = ?config(tc52,Config),
+    ok.
+
+conf6_tc1(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    conf5 = ?config(cc5,Config),
+    conf6 = ?config(cc6,Config),
+    undefined = ?config(tc52,Config),
+    conf6_tc1 = ?config(tc61,Config),
+    ok.
+conf6_tc2(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf5 = ?config(cc5,Config),
+    conf6 = ?config(cc6,Config),
+    undefined = ?config(tc61,Config),
+    conf6_tc2 = ?config(tc62,Config),
+    ok.
diff --git a/lib/test_server/test/test_server_line_SUITE.erl b/lib/test_server/test/test_server_line_SUITE.erl
new file mode 100644
index 0000000000..02897f164f
--- /dev/null
+++ b/lib/test_server/test/test_server_line_SUITE.erl
@@ -0,0 +1,122 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-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%
+%%
+
+%%%------------------------------------------------------------------
+%%% Test Server self test. 
+%%%------------------------------------------------------------------
+-module(test_server_line_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+-export([all/1]).
+-export([init_per_testcase/2, fin_per_testcase/2]).
+-export([parse_transform/1, lines/1]).
+
+all(doc) -> ["Test of parse transform for collection line numbers"];
+all(suite) -> [parse_transform,lines].
+
+
+init_per_testcase(_Case, Config) ->
+    ?line test_server_line:clear(),
+    Dog = ?t:timetrap(?t:minutes(2)),
+    [{watchdog, Dog}|Config].
+
+fin_per_testcase(_Case, Config) ->
+    ?line test_server_line:clear(),
+    Dog=?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+parse_transform(suite) -> [];
+parse_transform(doc) -> [];
+parse_transform(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    code:add_pathz(DataDir),
+
+    ?line ok = parse_transform_test:excluded(),
+    ?line [] = test_server_line:get_lines(),
+
+    ?line test_server_line:clear(),
+    ?line ok = parse_transform_test:func(),
+
+    ?line [{parse_transform_test,func4,58},
+	   {parse_transform_test,func,49},
+	   {parse_transform_test,func3,56},
+	   {parse_transform_test,func,39},
+	   {parse_transform_test,func2,54},
+	   {parse_transform_test,func,36},
+	   {parse_transform_test,func1,52},
+	   {parse_transform_test,func,35}] = test_server_line:get_lines(),
+    
+    code:del_path(DataDir),
+    ok.
+
+lines(suite) -> [];
+lines(doc) -> ["Test parse transform for collection line numbers"];
+lines(Config) when is_list(Config) ->
+    ?line L0 = [{mod,func,1},{mod,func,2},{mod,func,3},
+		{m,f,4},{m,f,5},{m,f,6},
+		{mo,fu,7},{mo,fu,8},{mo,fu,9}],
+    ?line LL = string:copies(L0, 1000),
+    ?line T1 = erlang:now(),
+    ?line lists:foreach(fun ({M,F,L}) -> 
+				test_server_line:'$test_server_line'(M, F, L) 
+			end, LL),
+    ?line T2 = erlang:now(),
+    ?line Long = test_server_line:get_lines(),
+    ?line test_server_line:clear(),
+    
+    ?line T3 = erlang:now(),
+    ?line lists:foreach(fun ({M,F,L}) -> 
+				test_server_line:'$test_server_lineQ'(M, F, L) 
+			end, LL),
+    ?line T4 = erlang:now(),
+    ?line LongQ = test_server_line:get_lines(),
+
+    ?line io:format("'$test_server_line': ~f~n'$test_server_lineQ': ~f~n",
+		    [timer:now_diff(T2, T1)/1000, timer:now_diff(T4, T3)/1000]),
+    ?line io:format("'$test_server_line' result long:~p~n", [Long]),
+    ?line io:format("'$test_server_lineQ' result long:~p~n", [LongQ]),
+
+    if Long =:= LongQ ->
+	    ?line ok;
+       true ->
+	    ?line ?t:fail("The two methods did not produce same result for"
+			  " long lists of lines")
+    end,
+    
+    ?line test_server_line:clear(),
+    ?line lists:foreach(fun ({M,F,L}) -> 
+				test_server_line:'$test_server_line'(M, F, L) 
+			end, L0),
+    ?line Short = test_server_line:get_lines(),
+    ?line test_server_line:clear(),
+    ?line lists:foreach(fun ({M,F,L}) -> 
+				test_server_line:'$test_server_lineQ'(M, F, L) 
+			end, L0),
+    ?line ShortQ = test_server_line:get_lines(),
+
+    ?line io:format("'$test_server_line' result short:~p~n", [Short]),
+    ?line io:format("'$test_server_lineQ' result short:~p~n", [ShortQ]),
+    
+    if Short =:= ShortQ ->
+	    ?line ok;
+       true ->
+	    ?line ?t:fail("The two methods did not produce same result for"
+			  " shot lists of lines\n")
+    end.
diff --git a/lib/test_server/test/test_server_line_SUITE_data/Makefile.src b/lib/test_server/test/test_server_line_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..a077648934
--- /dev/null
+++ b/lib/test_server/test/test_server_line_SUITE_data/Makefile.src
@@ -0,0 +1,6 @@
+EFLAGS=+debug_info -pa ../../test_server -I../../test_server
+           
+all: parse_transform_test.@EMULATOR@
+
+parse_transform_test.@EMULATOR@: parse_transform_test.erl
+	erlc $(EFLAGS) parse_transform_test.erl
diff --git a/lib/test_server/test/test_server_line_SUITE_data/parse_transform_test.erl b/lib/test_server/test/test_server_line_SUITE_data/parse_transform_test.erl
new file mode 100644
index 0000000000..c3ee1b68cd
--- /dev/null
+++ b/lib/test_server/test/test_server_line_SUITE_data/parse_transform_test.erl
@@ -0,0 +1,59 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2004-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(parse_transform_test).
+
+-include("test_server_line.hrl").
+-no_lines([{excluded,0}]).
+
+-export([excluded/0, func/0]).
+
+
+excluded() ->
+    line1,
+    line2,
+    ok.
+
+
+func() ->
+    hello,
+    func1(),
+    case func2() of
+	ok ->
+	    helloagain,
+	    case func3() of
+		ok ->
+		    ok;
+		error ->
+		    error
+	    end;
+	error ->
+	    error
+    end,
+    excluded(),
+    func4().
+
+func1() ->
+    ok.
+func2() ->
+    ok.
+func3() ->
+    error.
+func4() ->
+    ok.
+
diff --git a/lib/test_server/test/test_server_parallel01_SUITE.erl b/lib/test_server/test/test_server_parallel01_SUITE.erl
new file mode 100644
index 0000000000..0e7f329f89
--- /dev/null
+++ b/lib/test_server/test/test_server_parallel01_SUITE.erl
@@ -0,0 +1,518 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-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%
+%%
+
+%%%------------------------------------------------------------------
+%%% Test Server self test. 
+%%%------------------------------------------------------------------
+-module(test_server_parallel01_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+-compile(export_all).
+
+%% -------------------------------------------------------------------
+%% Notes on parallel execution of test cases
+%% -------------------------------------------------------------------
+%%
+%% A group nested under a parallel group will start executing in
+%% parallel with previous (parallel) test cases (no matter what
+%% properties the nested group has). Test cases are however never 
+%% executed in parallel with the start or end conf case of the same
+%% group! Because of this, the test_server_ctrl loop waits at
+%% the end conf of a group for all parallel cases to finish
+%% before the end conf case actually executes. This has the effect
+%% that it's only after a nested group has finished that any
+%% remaining parallel cases in the previous group get spawned (*). 
+%% Example (all parallel cases):
+%%
+%% group1_init   |---->
+%% group1_case1        | --------->
+%% group1_case2        | --------------------------------->
+%% group2_init         | ---->
+%% group2_case1               | ------>
+%% group2_case2               | ---------->
+%% group2_end                              | --->
+%% group1_case3                               (*)| ---->
+%% group1_case4                               (*)| -->
+%% group1_end                                              | --->
+%%
+
+all(doc) -> ["Test simple conf case structure, with and without nested cases"];
+all(suite) -> 
+    [
+     {conf, [parallel], conf1_init, [conf1_tc1, conf1_tc2], conf1_end},
+
+     {conf, [parallel], conf2_init, [conf2_tc1, conf2_tc2], conf2_end},
+
+     {conf, [parallel], conf3_init, [conf3_tc1, conf3_tc1,
+				     
+				     {conf, [], 
+				      conf4_init, [conf4_tc1, conf4_tc2], conf4_end},
+				     
+				     conf3_tc2], conf3_end},
+
+     conf5,
+
+     {conf, [parallel], conf7_init, [conf7_tc1, conf7_tc1,
+				     
+				     {conf, [parallel], 
+				      conf8_init, [conf8_tc1, conf8_tc2], conf8_end},
+				     
+				     conf7_tc2], conf7_end}
+     
+    ].
+
+
+%%---------- conf cases ----------
+
+init_per_suite(Config) ->
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    [{suite,init}|Config].
+end_per_suite(Config) ->
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    init = ?config(suite,Config),
+    ok.
+
+init_per_testcase(TC=conf1_tc1, Config) ->
+    init = ?config(suite,Config),
+    [{tc11,TC}|Config];
+init_per_testcase(TC=conf1_tc2, Config) ->
+    [{tc12,TC}|Config];
+init_per_testcase(TC=conf2_tc1, Config) ->
+    [{tc21,TC}|Config];
+init_per_testcase(TC=conf2_tc2, Config) ->
+    [{tc22,TC}|Config];
+init_per_testcase(TC=conf3_tc1, Config) ->
+    [{tc31,TC}|Config];
+init_per_testcase(TC=conf3_tc2, Config) ->
+    [{tc32,TC}|Config];
+init_per_testcase(TC=conf4_tc1, Config) ->
+    [{tc41,TC}|Config];
+init_per_testcase(TC=conf4_tc2, Config) ->
+    [{tc42,TC}|Config];
+init_per_testcase(TC=conf5_tc1, Config) ->
+    [{tc51,TC}|Config];
+init_per_testcase(TC=conf5_tc2, Config) ->
+    [{tc52,TC}|Config];
+init_per_testcase(TC=conf6_tc1, Config) ->
+    [{tc61,TC}|Config];
+init_per_testcase(TC=conf6_tc2, Config) ->
+    init = ?config(suite,Config),
+    [{tc62,TC}|Config];
+init_per_testcase(TC=conf7_tc1, Config) ->
+    [{tc71,TC}|Config];
+init_per_testcase(TC=conf7_tc2, Config) ->
+    [{tc72,TC}|Config];
+init_per_testcase(TC=conf8_tc1, Config) ->
+    [{tc81,TC}|Config];
+init_per_testcase(TC=conf8_tc2, Config) ->
+    init = ?config(suite,Config),
+    [{tc82,TC}|Config].
+
+end_per_testcase(TC=conf1_tc1, Config) ->
+    init = ?config(suite,Config),
+    TC = ?config(tc11,Config),
+    ok;
+end_per_testcase(TC=conf1_tc2, Config) ->
+    TC = ?config(tc12,Config),
+    ok;
+end_per_testcase(TC=conf2_tc1, Config) ->
+    TC = ?config(tc21,Config),
+    ok;
+end_per_testcase(TC=conf2_tc2, Config) ->
+    TC = ?config(tc22,Config),
+    ok;
+end_per_testcase(TC=conf3_tc1, Config) ->
+    TC = ?config(tc31,Config),
+    ok;
+end_per_testcase(TC=conf3_tc2, Config) ->
+    TC = ?config(tc32,Config),
+    ok;
+end_per_testcase(TC=conf4_tc1, Config) ->
+    TC = ?config(tc41,Config),
+    ok;
+end_per_testcase(TC=conf4_tc2, Config) ->
+    TC = ?config(tc42,Config),
+    ok;
+end_per_testcase(TC=conf5_tc1, Config) ->
+    TC = ?config(tc51,Config),
+    ok;
+end_per_testcase(TC=conf5_tc2, Config) ->
+    TC = ?config(tc52,Config),
+    ok;
+end_per_testcase(TC=conf6_tc1, Config) ->
+    TC = ?config(tc61,Config),
+    ok;
+end_per_testcase(TC=conf6_tc2, Config) ->
+    init = ?config(suite,Config),
+    TC = ?config(tc62,Config),
+    ok;
+end_per_testcase(TC=conf7_tc1, Config) ->
+    TC = ?config(tc71,Config),
+    ok;
+end_per_testcase(TC=conf7_tc2, Config) ->
+    TC = ?config(tc72,Config),
+    ok;
+end_per_testcase(TC=conf8_tc1, Config) ->
+    TC = ?config(tc81,Config),
+    ok;
+end_per_testcase(TC=conf8_tc2, Config) ->
+    init = ?config(suite,Config),
+    TC = ?config(tc82,Config),
+    ok.
+
+conf1_init(Config) when is_list(Config) ->
+    test_server:comment(io_lib:format("~p",[now()])),
+    [parallel] = ?config(tc_group_properties,Config),
+    init = ?config(suite,Config),
+    [{t0,now()},{cc1,conf1}|Config].
+conf1_end(Config) ->
+    %% check 2s & 3s < 4s
+    Ms = timer:now_diff(now(),?config(t0,Config)),
+    test_server:comment(io_lib:format("~p",[now()])),
+    if Ms > 3500000 -> exit({bad_parallel_exec,Ms});
+       Ms < 3000000 -> exit({bad_parallel_exec,Ms});
+       true -> ok
+    end.
+
+conf2_init(Config) when is_list(Config) ->
+    test_server:comment(io_lib:format("~p",[now()])),
+    [parallel] = ?config(tc_group_properties,Config),
+    [{t0,now()},{cc2,conf2}|Config].
+conf2_end(Config) ->
+    %% check 3s & 2s < 4s
+    Ms = timer:now_diff(now(),?config(t0,Config)),
+    test_server:comment(io_lib:format("~p",[now()])),
+    if Ms > 3500000 -> exit({bad_parallel_exec,Ms});
+       Ms < 3000000 -> exit({bad_parallel_exec,Ms});
+       true -> ok
+    end.
+
+conf3_init(Config) when is_list(Config) ->
+    test_server:comment(io_lib:format("~p",[now()])),
+    [parallel] = ?config(tc_group_properties,Config),
+    [{t0,now()},{cc3,conf3}|Config].
+conf3_end(Config) ->
+    %% check 6s & 6s & (2s & 3s) & 1s = ~6s
+    Ms = timer:now_diff(now(),?config(t0,Config)),
+    test_server:comment(io_lib:format("~p",[now()])),
+    if Ms > 6500000 -> exit({bad_parallel_exec,Ms});
+       Ms < 6000000 -> exit({bad_parallel_exec,Ms});
+       true -> ok
+    end.
+
+conf4_init(Config) when is_list(Config) ->
+    test_server:comment(io_lib:format("~p",[now()])),
+    [] = ?config(tc_group_properties,Config),
+    [{t0,now()},{cc4,conf4}|Config].
+conf4_end(Config) ->
+    %% check 2s & 3s >= 5s
+    Ms = timer:now_diff(now(),?config(t0,Config)),
+    test_server:comment(io_lib:format("~p",[now()])),
+    if Ms > 5500000 -> exit({bad_parallel_exec,Ms});
+       Ms < 5000000 -> exit({bad_parallel_exec,Ms});
+       true -> ok
+    end.
+
+conf5_init(Config) when is_list(Config) ->
+    test_server:comment(io_lib:format("~p",[now()])),
+    [] = ?config(tc_group_properties,Config),
+    [{t0,now()},{cc5,conf5}|Config].
+conf5_end(Config) ->
+    %% check 1s & 1s & (3s & 2s) & 1s = ~6s
+    Ms = timer:now_diff(now(),?config(t0,Config)),
+    test_server:comment(io_lib:format("~p",[now()])),
+    if Ms > 7000000 -> exit({bad_parallel_exec,Ms});
+       Ms < 6000000 -> exit({bad_parallel_exec,Ms});
+       true -> ok
+    end.
+
+conf6_init(Config) when is_list(Config) ->
+    test_server:comment(io_lib:format("~p",[now()])),
+    [parallel] = ?config(tc_group_properties,Config),
+    init = ?config(suite,Config),
+    [{t0,now()},{cc6,conf6}|Config].
+conf6_end(Config) ->
+    %% check 3s & 2s < 5s
+    Ms = timer:now_diff(now(),?config(t0,Config)),
+    test_server:comment(io_lib:format("~p",[now()])),
+    if Ms > 3500000 -> exit({bad_parallel_exec,Ms});
+       Ms < 3000000 -> exit({bad_parallel_exec,Ms});
+       true -> ok
+    end.
+
+conf5(suite) ->					% test specification
+    [{conf, conf5_init, [conf5_tc1, conf5_tc1,
+
+			 {conf, [parallel], conf6_init, [conf6_tc1, conf6_tc2], conf6_end},
+
+			 conf5_tc2], conf5_end}].
+
+conf7_init(Config) when is_list(Config) ->
+    test_server:comment(io_lib:format("~p",[now()])),
+    [parallel] = ?config(tc_group_properties,Config),
+    [{t0,now()},{cc7,conf7}|Config].
+conf7_end(Config) ->
+    %% check 1s & 1s & (2s & 2s) & 1s = ~3s 
+    Ms = timer:now_diff(now(),?config(t0,Config)),
+    test_server:comment(io_lib:format("~p",[now()])),
+    if Ms > 3500000 -> exit({bad_parallel_exec,Ms});
+       Ms < 3000000 -> exit({bad_parallel_exec,Ms});
+       true -> ok
+    end.
+
+conf8_init(Config) when is_list(Config) ->
+    test_server:comment(io_lib:format("~p",[now()])),
+    [parallel] = ?config(tc_group_properties,Config),
+    init = ?config(suite,Config),
+    [{t0,now()},{cc8,conf8}|Config].
+conf8_end(Config) ->
+    %% check 2s & 2s < 4s
+    Ms = timer:now_diff(now(),?config(t0,Config)),
+    test_server:comment(io_lib:format("~p",[now()])),
+    if Ms > 2500000 -> exit({bad_parallel_exec,Ms});
+       Ms < 2000000 -> exit({bad_parallel_exec,Ms});
+       true -> ok
+    end.
+
+
+%%---------- test cases ----------
+
+conf1_tc1(Config) when is_list(Config) ->
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    init = ?config(suite,Config),
+    conf1 = ?config(cc1,Config),
+    conf1_tc1 = ?config(tc11,Config),
+    timer:sleep(2000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+conf1_tc2(Config) when is_list(Config) ->
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    init = ?config(suite,Config),
+    conf1 = ?config(cc1,Config),
+    conf1_tc2 = ?config(tc12,Config),
+    timer:sleep(3000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+
+conf2_tc1(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(cc1,Config),
+    undefined = ?config(tc11,Config),
+    conf2 = ?config(cc2,Config),
+    conf2_tc1 = ?config(tc21,Config),
+    timer:sleep(3000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+conf2_tc2(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    conf2 = ?config(cc2,Config),
+    undefined = ?config(tc21,Config),
+    conf2_tc2 = ?config(tc22,Config),
+    timer:sleep(2000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+
+conf3_tc1(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(tc22,Config),
+    conf3 = ?config(cc3,Config),
+    conf3_tc1 = ?config(tc31,Config),
+    timer:sleep(6000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+conf3_tc2(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    conf3 = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    undefined = ?config(tc31,Config),
+    undefined = ?config(tc41,Config),
+    conf3_tc2 = ?config(tc32,Config),
+    timer:sleep(1000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+
+conf4_tc1(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    conf3 = ?config(cc3,Config),
+    conf4 = ?config(cc4,Config),
+    undefined = ?config(tc32,Config),
+    conf4_tc1 = ?config(tc41,Config),
+    timer:sleep(2000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+conf4_tc2(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf3 = ?config(cc3,Config),
+    conf4 = ?config(cc4,Config),
+    undefined = ?config(tc41,Config),
+    conf4_tc2 = ?config(tc42,Config),
+    timer:sleep(3000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+
+conf5_tc1(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    conf5 = ?config(cc5,Config),
+    undefined = ?config(tc42,Config),
+    conf5_tc1 = ?config(tc51,Config),
+    timer:sleep(1000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+conf5_tc2(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf5 = ?config(cc5,Config),
+    undefined = ?config(cc6,Config),
+    undefined = ?config(tc51,Config),
+    undefined = ?config(tc62,Config),
+    conf5_tc2 = ?config(tc52,Config),
+    timer:sleep(1000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+
+conf6_tc1(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    conf5 = ?config(cc5,Config),
+    conf6 = ?config(cc6,Config),
+    undefined = ?config(tc52,Config),
+    conf6_tc1 = ?config(tc61,Config),
+    timer:sleep(3000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+conf6_tc2(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf5 = ?config(cc5,Config),
+    conf6 = ?config(cc6,Config),
+    undefined = ?config(tc61,Config),
+    conf6_tc2 = ?config(tc62,Config),
+    timer:sleep(2000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+
+conf7_tc1(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    undefined = ?config(cc5,Config),
+    undefined = ?config(cc6,Config),
+    conf7 = ?config(cc7,Config),
+    undefined = ?config(tc62,Config),
+    conf7_tc1 = ?config(tc71,Config),
+    timer:sleep(1000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+conf7_tc2(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf7 = ?config(cc7,Config),
+    undefined = ?config(cc8,Config),
+    undefined = ?config(tc71,Config),
+    undefined = ?config(tc82,Config),
+    conf7_tc2 = ?config(tc72,Config),
+    timer:sleep(1000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+
+conf8_tc1(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    undefined = ?config(cc5,Config),
+    undefined = ?config(cc6,Config),
+    conf7 = ?config(cc7,Config),
+    conf8 = ?config(cc8,Config),
+    undefined = ?config(tc72,Config),
+    conf8_tc1 = ?config(tc81,Config),
+    timer:sleep(2000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
+conf8_tc2(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf7 = ?config(cc7,Config),
+    conf8 = ?config(cc8,Config),
+    undefined = ?config(tc81,Config),
+    conf8_tc2 = ?config(tc82,Config),
+    timer:sleep(2000),
+    test_server:comment(io_lib:format("~p",[now()])),
+    ok.
diff --git a/lib/test_server/test/test_server_shuffle01_SUITE.erl b/lib/test_server/test/test_server_shuffle01_SUITE.erl
new file mode 100644
index 0000000000..7ad269501d
--- /dev/null
+++ b/lib/test_server/test/test_server_shuffle01_SUITE.erl
@@ -0,0 +1,471 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-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%
+%%
+
+%%%------------------------------------------------------------------
+%%% Test Server self test. 
+%%%------------------------------------------------------------------
+-module(test_server_shuffle01_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+-compile(export_all).
+
+all(doc) -> ["Test simple conf case structure, with and without nested cases"];
+all(suite) -> 
+    [
+     {conf, [shuffle], conf1_init, [conf1_tc1, conf1_tc2, conf1_tc3], conf1_end},
+
+     {conf, [{shuffle,{1,2,3}}], conf2_init, [conf2_tc1, conf2_tc2, conf2_tc3], conf2_end},
+
+     {conf, [shuffle], conf3_init, [conf3_tc1, conf3_tc2, conf3_tc3,
+				    
+				    {conf, [], conf4_init, 
+				     [conf4_tc1, conf4_tc2], conf4_end}], 
+                       conf3_end},
+
+     conf5,
+
+     {conf, [shuffle,{repeat,5},parallel], conf7_init, [conf7_tc1, 
+				    
+				    {conf, [{shuffle,{3,2,1}},{repeat,3}], 
+				     conf8_init, [conf8_tc1, conf8_tc2, conf8_tc3], 
+				     conf8_end},
+				    
+				    conf7_tc2, conf7_tc3], conf7_end}
+     
+    ].
+
+
+%%---------- conf cases ----------
+
+init_per_suite(Config) ->
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    [{suite,init}|Config].
+end_per_suite(Config) ->
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    init = ?config(suite,Config),
+    ok.
+
+init_per_testcase(TC=conf1_tc1, Config) ->
+    init = ?config(suite,Config),
+    [{tc11,TC}|Config];
+init_per_testcase(TC=conf1_tc2, Config) ->
+    [{tc12,TC}|Config];
+init_per_testcase(TC=conf1_tc3, Config) ->
+    [{tc13,TC}|Config];
+init_per_testcase(TC=conf2_tc1, Config) ->
+    [{tc21,TC}|Config];
+init_per_testcase(TC=conf2_tc2, Config) ->
+    [{tc22,TC}|Config];
+init_per_testcase(TC=conf2_tc3, Config) ->
+    [{tc23,TC}|Config];
+init_per_testcase(TC=conf3_tc1, Config) ->
+    [{tc31,TC}|Config];
+init_per_testcase(TC=conf3_tc2, Config) ->
+    [{tc32,TC}|Config];
+init_per_testcase(TC=conf3_tc3, Config) ->
+    [{tc33,TC}|Config];
+init_per_testcase(TC=conf4_tc1, Config) ->
+    [{tc41,TC}|Config];
+init_per_testcase(TC=conf4_tc2, Config) ->
+    [{tc42,TC}|Config];
+init_per_testcase(TC=conf5_tc1, Config) ->
+    [{tc51,TC}|Config];
+init_per_testcase(TC=conf5_tc2, Config) ->
+    [{tc52,TC}|Config];
+init_per_testcase(TC=conf6_tc1, Config) ->
+    [{tc61,TC}|Config];
+init_per_testcase(TC=conf6_tc2, Config) ->
+    init = ?config(suite,Config),
+    [{tc62,TC}|Config];
+init_per_testcase(TC=conf6_tc3, Config) ->
+    [{tc63,TC}|Config];
+init_per_testcase(TC=conf7_tc1, Config) ->
+    [{tc71,TC}|Config];
+init_per_testcase(TC=conf7_tc2, Config) ->
+    [{tc72,TC}|Config];
+init_per_testcase(TC=conf7_tc3, Config) ->
+    [{tc73,TC}|Config];
+init_per_testcase(TC=conf8_tc1, Config) ->
+    [{tc81,TC}|Config];
+init_per_testcase(TC=conf8_tc2, Config) ->
+    init = ?config(suite,Config),
+    [{tc82,TC}|Config];
+init_per_testcase(TC=conf8_tc3, Config) ->
+    [{tc83,TC}|Config].
+
+end_per_testcase(TC=conf1_tc1, Config) ->
+    init = ?config(suite,Config),
+    TC = ?config(tc11,Config),
+    ok;
+end_per_testcase(TC=conf1_tc2, Config) ->
+    TC = ?config(tc12,Config),
+    ok;
+end_per_testcase(TC=conf1_tc3, Config) ->
+    TC = ?config(tc13,Config),
+    ok;
+end_per_testcase(TC=conf2_tc1, Config) ->
+    TC = ?config(tc21,Config),
+    ok;
+end_per_testcase(TC=conf2_tc2, Config) ->
+    TC = ?config(tc22,Config),
+    ok;
+end_per_testcase(TC=conf2_tc3, Config) ->
+    TC = ?config(tc23,Config),
+    ok;
+end_per_testcase(TC=conf3_tc1, Config) ->
+    TC = ?config(tc31,Config),
+    ok;
+end_per_testcase(TC=conf3_tc2, Config) ->
+    TC = ?config(tc32,Config),
+    ok;
+end_per_testcase(TC=conf3_tc3, Config) ->
+    TC = ?config(tc33,Config),
+    ok;
+end_per_testcase(TC=conf4_tc1, Config) ->
+    TC = ?config(tc41,Config),
+    ok;
+end_per_testcase(TC=conf4_tc2, Config) ->
+    TC = ?config(tc42,Config),
+    ok;
+end_per_testcase(TC=conf5_tc1, Config) ->
+    TC = ?config(tc51,Config),
+    ok;
+end_per_testcase(TC=conf5_tc2, Config) ->
+    TC = ?config(tc52,Config),
+    ok;
+end_per_testcase(TC=conf6_tc1, Config) ->
+    TC = ?config(tc61,Config),
+    ok;
+end_per_testcase(TC=conf6_tc2, Config) ->
+    init = ?config(suite,Config),
+    TC = ?config(tc62,Config),
+    ok;
+end_per_testcase(TC=conf6_tc3, Config) ->
+    TC = ?config(tc63,Config),
+    ok;
+end_per_testcase(TC=conf7_tc1, Config) ->
+    TC = ?config(tc71,Config),
+    ok;
+end_per_testcase(TC=conf7_tc2, Config) ->
+    TC = ?config(tc72,Config),
+    ok;
+end_per_testcase(TC=conf7_tc3, Config) ->
+    TC = ?config(tc73,Config),
+    ok;
+end_per_testcase(TC=conf8_tc1, Config) ->
+    TC = ?config(tc81,Config),
+    ok;
+end_per_testcase(TC=conf8_tc2, Config) ->
+    init = ?config(suite,Config),
+    TC = ?config(tc82,Config),
+    ok;
+end_per_testcase(TC=conf8_tc3, Config) ->
+    TC = ?config(tc83,Config),
+    ok.
+
+
+conf1_init(Config) when is_list(Config) ->
+    init = ?config(suite,Config),
+    [{shuffle,{_,_,_}}] = ?config(tc_group_properties,Config),
+    test_server:comment("Shuffle (random seed)"),
+    [{cc1,conf1}|Config].
+conf1_end(_Config) ->
+    ok.
+
+conf2_init(Config) when is_list(Config) ->
+    [{shuffle,{1,2,3}}] = ?config(tc_group_properties,Config),
+    test_server:comment("Shuffle (user seed)"),
+    [{cc2,conf2}|Config].
+conf2_end(_Config) ->
+    ok.
+
+conf3_init(Config) when is_list(Config) ->
+    [{shuffle,{_,_,_}}] = ?config(tc_group_properties,Config),
+    test_server:comment("Shuffle (random)"),
+    [{cc3,conf3}|Config].
+conf3_end(_Config) ->
+    ok.
+
+conf4_init(Config) when is_list(Config) ->
+    [] = ?config(tc_group_properties,Config),
+    test_server:comment("No shuffle"),
+    [{cc4,conf4}|Config].
+conf4_end(_Config) ->
+    ok.
+
+conf5_init(Config) when is_list(Config) ->
+    [] = ?config(tc_group_properties,Config),
+    test_server:comment("No shuffle"),
+    [{cc5,conf5}|Config].
+conf5_end(_Config) ->
+    ok.
+
+conf6_init(Config) when is_list(Config) ->
+    [{shuffle,{_,_,_}}] = ?config(tc_group_properties,Config),
+    test_server:comment("Shuffle (random)"),
+    init = ?config(suite,Config),
+    [{cc6,conf6}|Config].
+conf6_end(_Config) ->
+    ok.
+
+conf5(suite) ->					% test specification
+    [{conf, conf5_init, [conf5_tc1, 
+
+			 {conf, [shuffle], conf6_init, 
+			  [conf6_tc1, conf6_tc2, conf6_tc3], 
+			  conf6_end},
+
+			 conf5_tc2], conf5_end}].
+
+conf7_init(Config) when is_list(Config) ->
+    test_server:comment("Group 7, Shuffle (random seed)"),
+    case proplists:get_value(shuffle,?config(tc_group_properties,Config)) of
+	{_,_,_} -> ok
+    end,
+    [{cc7,conf7}|Config].
+conf7_end(_Config) ->
+    ok.
+
+conf8_init(Config) when is_list(Config) ->
+    test_server:comment("Group 8, Shuffle (user start seed)"),
+    case proplists:get_value(shuffle,?config(tc_group_properties,Config)) of
+	{_,_,_} -> ok
+    end,
+    init = ?config(suite,Config),
+    [{cc8,conf8}|Config].
+conf8_end(_Config) ->
+    ok.
+
+
+%%---------- test cases ----------
+
+conf1_tc1(Config) when is_list(Config) ->
+    test_server:comment("Case 1"),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    init = ?config(suite,Config),
+    conf1 = ?config(cc1,Config),
+    conf1_tc1 = ?config(tc11,Config),
+    ok.
+conf1_tc2(Config) when is_list(Config) ->
+    test_server:comment("Case 2"),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    init = ?config(suite,Config),
+    conf1 = ?config(cc1,Config),
+    conf1_tc2 = ?config(tc12,Config),
+    ok.
+conf1_tc3(suite) -> [];
+conf1_tc3(_Config) ->
+    test_server:comment("Case 3"),
+    ok.
+    
+conf2_tc1(Config) when is_list(Config) ->
+    test_server:comment("Case 1"),
+    init = ?config(suite,Config),
+    undefined = ?config(cc1,Config),
+    conf2 = ?config(cc2,Config),
+    conf2_tc1 = ?config(tc21,Config),
+    ok.
+conf2_tc2(Config) when is_list(Config) ->
+    test_server:comment("Case 2"),
+    init = ?config(suite,Config),
+    conf2 = ?config(cc2,Config),
+    conf2_tc2 = ?config(tc22,Config),
+    ok.
+conf2_tc3(suite) -> [];
+conf2_tc3(_Config) ->    
+    test_server:comment("Case 3"),
+    ok.
+
+conf3_tc1(Config) when is_list(Config) ->
+    test_server:comment("Case 1"),
+    init = ?config(suite,Config),
+    undefined = ?config(cc2,Config),
+    conf3 = ?config(cc3,Config),
+    conf3_tc1 = ?config(tc31,Config),
+    ok.
+conf3_tc2(Config) when is_list(Config) ->
+    test_server:comment("Case 2"),
+    init = ?config(suite,Config),
+    conf3 = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    conf3_tc2 = ?config(tc32,Config),
+    ok.
+conf3_tc3(suite) -> [];
+conf3_tc3(_Config) ->
+    test_server:comment("Case 3"),
+    ok.
+
+conf4_tc1(Config) when is_list(Config) ->
+    test_server:comment("Case 1"),
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    conf3 = ?config(cc3,Config),
+    conf4 = ?config(cc4,Config),
+    conf4_tc1 = ?config(tc41,Config),
+    ok.
+conf4_tc2(Config) when is_list(Config) ->
+    test_server:comment("Case 2"),
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf3 = ?config(cc3,Config),
+    conf4 = ?config(cc4,Config),
+    conf4_tc2 = ?config(tc42,Config),
+    ok.
+
+conf5_tc1(Config) when is_list(Config) ->
+    test_server:comment("Case 1"),
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    conf5 = ?config(cc5,Config),
+    conf5_tc1 = ?config(tc51,Config),
+    ok.
+conf5_tc2(Config) when is_list(Config) ->
+    test_server:comment("Case 2"),
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf5 = ?config(cc5,Config),
+    undefined = ?config(cc6,Config),
+    conf5_tc2 = ?config(tc52,Config),
+    ok.
+
+conf6_tc1(Config) when is_list(Config) ->
+    test_server:comment("Case 1"),
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    conf5 = ?config(cc5,Config),
+    conf6 = ?config(cc6,Config),
+    conf6_tc1 = ?config(tc61,Config),
+    ok.
+conf6_tc2(Config) when is_list(Config) ->
+    test_server:comment("Case 2"),
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf5 = ?config(cc5,Config),
+    conf6 = ?config(cc6,Config),
+    conf6_tc2 = ?config(tc62,Config),
+    ok.
+conf6_tc3(suite) -> [];
+conf6_tc3(_Config) ->
+    test_server:comment("Case 3"),
+    ok.
+
+conf7_tc1(Config) when is_list(Config) ->
+    test_server:comment("Case 1"),
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    undefined = ?config(cc5,Config),
+    undefined = ?config(cc6,Config),
+    conf7 = ?config(cc7,Config),
+    conf7_tc1 = ?config(tc71,Config),
+    ok.
+conf7_tc2(Config) when is_list(Config) ->
+    test_server:comment("Case 2"),
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf7 = ?config(cc7,Config),
+    undefined = ?config(cc8,Config),
+    conf7_tc2 = ?config(tc72,Config),
+    ok.
+conf7_tc3(suite) -> [];
+conf7_tc3(_Config) ->
+    test_server:comment("Case 3"),
+    ok.
+
+conf8_tc1(Config) when is_list(Config) ->
+    test_server:comment("Case 1"),
+    init = ?config(suite,Config),
+    case ?config(data_dir,Config) of
+	undefined -> exit(no_data_dir);
+	_ -> ok
+    end,    
+    undefined = ?config(cc1,Config),
+    undefined = ?config(cc2,Config),
+    undefined = ?config(cc3,Config),
+    undefined = ?config(cc4,Config),
+    undefined = ?config(cc5,Config),
+    undefined = ?config(cc6,Config),
+    conf7 = ?config(cc7,Config),
+    conf8 = ?config(cc8,Config),
+    conf8_tc1 = ?config(tc81,Config),
+    ok.
+conf8_tc2(Config) when is_list(Config) ->
+    test_server:comment("Case 2"),
+    init = ?config(suite,Config),
+    case ?config(priv_dir,Config) of
+	undefined -> exit(no_priv_dir);
+	_ -> ok
+    end,    
+    conf7 = ?config(cc7,Config),
+    conf8 = ?config(cc8,Config),
+    conf8_tc2 = ?config(tc82,Config),
+    ok.
+conf8_tc3(suite) -> [];
+conf8_tc3(_Config) ->
+    test_server:comment("Case 3"),
+    ok.
diff --git a/lib/test_server/test/test_server_skip_SUITE.erl b/lib/test_server/test/test_server_skip_SUITE.erl
new file mode 100644
index 0000000000..4037e1cc0e
--- /dev/null
+++ b/lib/test_server/test/test_server_skip_SUITE.erl
@@ -0,0 +1,43 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-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%
+%%
+-module(test_server_skip_SUITE).
+
+-export([all/1, init_per_suite/1, end_per_suite/1]).
+-export([dummy/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("test_server/include/test_server_line.hrl").
+
+all(suite) ->
+    [dummy].
+
+init_per_suite(Config) when is_list(Config) ->
+    {skip,"Skipping init_per_suite - check that \'dummy\' and"
+     " \'end_per_suite\' are also skipped"}.
+
+dummy(suite) -> [];
+dummy(doc) -> ["This testcase should never be executed"];
+dummy(Config) when is_list(Config) ->
+    ?t:fail("This testcase should be executed since"
+	    " init_per_suite/1 is skipped").
+
+end_per_suite(doc) -> ["This testcase should never be executed"];
+end_per_suite(Config) when is_list(Config) ->
+    ?t:fail("end_per_suite/1 should not be executed when"
+	    " init_per_suite/1 is skipped").
diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk
index 8e02fde8bc..e3aac682ec 100644
--- a/lib/test_server/vsn.mk
+++ b/lib/test_server/vsn.mk
@@ -1,2 +1,2 @@
-TEST_SERVER_VSN = 3.3.5
+TEST_SERVER_VSN = 3.3.6