Merge branch 'peppe/common_test/dev/OTP-8753' into dev

* peppe/common_test/dev/OTP-8753:
  Fix problem with prepared_tests tuple not being recognized
  Add verification terms to test suite
  Fix various test suite, makefile, and doc related problems
  Fix error in the repeat_until_* group property handling
  Add test suite for groups with repeat property
  Add verification events to sequence group test suite
  Fix error in handling of sequence groups
  Fix error in test suite
  Fix problems with sequences and sub-groups
  Add test cases to sequence suite
  Fix error with group term in ct:run_test/1
  Add test suite to examplify problem with nested groups in a sequence

3 files changed, 52 insertions, 52 deletions

diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 3684ff462f..f8ace73cbf 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -464,9 +464,11 @@ logger_loop(State) ->
 					    {'EXIT',_Reason} ->
 						Fd = State#logger_state.ct_log_fd,
 						io:format(Fd, 
-							  "Logging fails! Str: ~p, Args: ~p~n",
+							  "Logging fails! "
+							  "Str: ~p, Args: ~p~n",
 							  [Str,Args]),
-						%% stop the testcase, we need to see the fault
+						%% stop the testcase, we need
+						%% to see the fault
 						exit(Pid,logging_failed),
 						ok;
 					    IoStr when IoList == [] ->
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index c14f0c5cee..586b3893f1 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -742,11 +742,12 @@ run_test1(StartOpts) ->
     %% test specification
     case proplists:get_value(spec, StartOpts) of
 	undefined ->
-	    case proplists:get_value(prepared_tests, StartOpts) of
-		undefined ->            % use dir|suite|case
-		    run_dir(Opts, StartOpts);
-		{{Run,Skip},Specs} ->	% use prepared tests
-		    run_prepared(Run, Skip, Opts#opts{testspecs = Specs}, StartOpts)
+	    case lists:keysearch(prepared_tests, 1, StartOpts) of
+		{value,{_,{Run,Skip},Specs}} ->	% use prepared tests
+		    run_prepared(Run, Skip, Opts#opts{testspecs = Specs},
+				 StartOpts);
+		false ->
+		    run_dir(Opts, StartOpts)
 	    end;
 	Specs ->
 	    Relaxed = get_start_opt(allow_user_terms, value, false, StartOpts),
@@ -882,8 +883,10 @@ run_dir(Opts = #opts{logdir = LogDir,
 	    case lists:keysearch(suite, 1, StartOpts) of
 		{value,{_,Suite}} when is_integer(hd(Suite)) ; is_atom(Suite) ->
 		    {Dir,Mod} = S2M(Suite),
-		    case listify(proplists:get_value(group, StartOpts, [])) ++
-			 listify(proplists:get_value(testcase, StartOpts, [])) of
+		    case groups_and_cases(proplists:get_value(group, StartOpts),
+					  proplists:get_value(testcase, StartOpts)) of
+			Error = {error,_} ->
+			    exit(Error);
 			[] ->
 			    reformat_result(catch do_run(tests(Dir, listify(Mod)),
 							 [], Opts1, StartOpts));
@@ -903,8 +906,10 @@ run_dir(Opts = #opts{logdir = LogDir,
 		    Mod = if is_atom(Suite) -> Suite;
 			     true -> list_to_atom(Suite)
 			  end,
-		    case listify(proplists:get_value(group, StartOpts, [])) ++
-			 listify(proplists:get_value(testcase, StartOpts, [])) of
+		    case groups_and_cases(proplists:get_value(group, StartOpts),
+					  proplists:get_value(testcase, StartOpts)) of
+			Error = {error,_} ->
+			    exit(Error);
 			[] ->
 			    reformat_result(catch do_run(tests(Dir, listify(Mod)),
 							 [], Opts1, StartOpts));
@@ -1090,11 +1095,13 @@ groups_and_cases(Gs, Cs) when ((Gs == undefined) or (Gs == [])) and
 			      ((Cs == undefined) or (Cs == [])) ->
     [];
 groups_and_cases(Gs, Cs) when Gs == undefined ; Gs == [] ->
-    [list_to_atom(C) || C <- Cs];
+    [ensure_atom(C) || C <- listify(Cs)];
 groups_and_cases(Gs, Cs) when Cs == undefined ; Cs == [] ->
-    [{list_to_atom(G),all} || G <- Gs];
+    [{ensure_atom(G),all} || G <- listify(Gs)];
+groups_and_cases(G, Cs) when is_atom(G) ->
+    [{G,[ensure_atom(C) || C <- listify(Cs)]}];
 groups_and_cases([G], Cs) ->
-    [{list_to_atom(G),[list_to_atom(C) || C <- Cs]}];
+    [{ensure_atom(G),[ensure_atom(C) || C <- listify(Cs)]}];
 groups_and_cases([_,_|_] , Cs) when Cs =/= [] ->
     {error,multiple_groups_and_cases};
 groups_and_cases(_Gs, _Cs) ->
@@ -1380,17 +1387,8 @@ suite_tuples([]) ->
     [].
 
 final_tests(Tests, Skip, Bad) ->
-
-    %%! --- Thu Jun 24 15:47:27 2010 --- peppe was here!
-    %%! io:format(user, "FINAL0 = ~p~nSKIP0 = ~p~n", [Tests, Skip]),
-
     {Tests1,Skip1} = final_tests1(Tests, [], Skip, Bad),
     Skip2 = final_skip(Skip1, []),
-
-
-    %%! --- Thu Jun 24 15:47:27 2010 --- peppe was here!
-    %%! io:format(user, "FINAL1 = ~p~nSKIP1 = ~p~n", [Tests1, Skip2]),
-
     {Tests1,Skip2}.
 
 final_tests1([{TestDir,Suites,_}|Tests], Final, Skip, Bad) when
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index d2a491e079..aa3413fa89 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -52,7 +52,7 @@
 %%%   NodeName = atom()
 %%% @doc Starts an Erlang node with name <code>Node</code> on the local host.
 %%% @see start/3
-start(Node)->
+start(Node) ->
     start(gethostname(), Node).
 
 %%%-----------------------------------------------------------------
@@ -70,7 +70,7 @@ start(Node)->
 %%% @doc Starts an Erlang node with name <code>Node</code> on host
 %%% <code>Host</code> with the default options.
 %%% @see start/3
-start(Host, Node)->
+start(Host, Node) ->
     start(Host, Node, []).
 
 %%%-----------------------------------------------------------------
@@ -163,7 +163,7 @@ start(Host, Node)->
 %%%   <code>NodeName</code> is the name of current node in this case.</item>
 %%% </list></p>
 %%%
-start(Host, Node, Options)->
+start(Host, Node, Options) ->
     ENode = enodename(Host, Node),
     case erlang:is_alive() of
 	false->
@@ -189,7 +189,7 @@ start(Host, Node, Options)->
 %%%   NodeName = atom()
 %%% @doc Stops the running Erlang node with name <code>Node</code> on
 %%% the localhost.
-stop(Node)->
+stop(Node) ->
     stop(gethostname(), Node).
 
 %%% @spec stop(Host, Node) -> Result
@@ -202,7 +202,7 @@ stop(Node)->
 %%%   NodeName = atom()
 %%% @doc Stops the running Erlang node with name <code>Node</code> on
 %%% host <code>Host</code>.
-stop(Host, Node)->
+stop(Host, Node) ->
     ENode = enodename(Host, Node),
     case is_started(ENode) of
 	{true, connected}->
@@ -214,7 +214,7 @@ stop(Host, Node)->
     end.
 
 %%% fetch an option value from the tagged tuple list with default
-get_option_value(Key, OptionList, Default)->
+get_option_value(Key, OptionList, Default) ->
     case lists:keyfind(Key, 1, OptionList) of
 	false->
 	     Default;
@@ -223,7 +223,7 @@ get_option_value(Key, OptionList, Default)->
     end.
 
 %%% convert option list to the option record, fill all defaults
-fetch_options(Options)->
+fetch_options(Options) ->
     UserName = get_option_value(username, Options, []),
     Password = get_option_value(password, Options, []),
     BootTimeout = get_option_value(boot_timeout, Options, 3),
@@ -240,23 +240,23 @@ fetch_options(Options)->
 
 % send a message when slave node is started
 % @hidden
-slave_started(ENode, MasterPid)->
+slave_started(ENode, MasterPid) ->
     MasterPid ! {node_started, ENode},
     ok.
 
 % send a message when slave node has finished startup
 % @hidden
-slave_ready(ENode, MasterPid)->
+slave_ready(ENode, MasterPid) ->
     MasterPid ! {node_ready, ENode},
     ok.
 
 % start monitoring of the master node
 % @hidden
-monitor_master(MasterNode)->
-    spawn(fun()->monitor_master_int(MasterNode) end).
+monitor_master(MasterNode) ->
+    spawn(fun() -> monitor_master_int(MasterNode) end).
 
 % code of the masterdeath-waiter process
-monitor_master_int(MasterNode)->
+monitor_master_int(MasterNode) ->
     erlang:monitor_node(MasterNode, true),
     receive
         {nodedown, MasterNode}->
@@ -264,11 +264,11 @@ monitor_master_int(MasterNode)->
     end.
 
 % check if node is listed in the nodes()
-is_connected(ENode)->
+is_connected(ENode) ->
     [N||N<-nodes(), N==ENode] == [ENode].
 
 % check if node is alive (ping and disconnect if pingable)
-is_started(ENode)->
+is_started(ENode) ->
     case is_connected(ENode) of
 	true->
 	    {true, connected};
@@ -283,11 +283,11 @@ is_started(ENode)->
     end.
 
 % make a Erlang node name from name and hostname
-enodename(Host, Node)->
+enodename(Host, Node) ->
     list_to_atom(atom_to_list(Node)++"@"++atom_to_list(Host)).
 
 % performs actual start of the "slave" node
-do_start(Host, Node, Options)->
+do_start(Host, Node, Options) ->
     ENode = enodename(Host, Node),
     Functions =
 	lists:concat([[{ct_slave, slave_started, [ENode, self()]}],
@@ -338,7 +338,7 @@ do_start(Host, Node, Options)->
     Result.
 
 % are we using fully qualified hostnames
-long_or_short()->
+long_or_short() ->
     case net_kernel:longnames() of
 	true->
 	    " -name ";
@@ -347,7 +347,7 @@ long_or_short()->
     end.
 
 % get the localhost's name, depending on the using name policy
-gethostname()->
+gethostname() ->
     Hostname = case net_kernel:longnames() of
 	true->
 	    net_adm:localhost();
@@ -358,19 +358,19 @@ gethostname()->
     list_to_atom(Hostname).
 
 % get cmd for starting Erlang
-get_cmd(Node, Flags)->
+get_cmd(Node, Flags) ->
     Cookie = erlang:get_cookie(),
     "erl -detached -noinput -setcookie "++ atom_to_list(Cookie) ++
     long_or_short() ++ atom_to_list(Node) ++ " " ++ Flags.
 
 % spawn node locally
-spawn_local_node(Node, Options)->
+spawn_local_node(Node, Options) ->
     ErlFlags = Options#options.erl_flags,
     Cmd = get_cmd(Node, ErlFlags),
     open_port({spawn, Cmd}, [stream]).
 
 % start crypto and ssh if not yet started
-check_for_ssh_running()->
+check_for_ssh_running() ->
     case application:get_application(crypto) of
 	undefined->
 	    application:start(crypto),
@@ -385,7 +385,7 @@ check_for_ssh_running()->
     end.
 
 % spawn node remotely
-spawn_remote_node(Host, Node, Options)->
+spawn_remote_node(Host, Node, Options) ->
     Username = Options#options.username,
     Password = Options#options.password,
     ErlFlags = Options#options.erl_flags,
@@ -403,16 +403,16 @@ spawn_remote_node(Host, Node, Options)->
     ssh_connection:exec(SSHConnRef, SSHChannelId, get_cmd(Node, ErlFlags), infinity).
 
 % call functions on a remote Erlang node
-call_functions(_Node, [])->
+call_functions(_Node, []) ->
     ok;
-call_functions(Node, [{M, F, A}|Functions])->
+call_functions(Node, [{M, F, A}|Functions]) ->
     rpc:call(Node, M, F, A),
     call_functions(Node, Functions).
 
 % wait N seconds until node is pingable
-wait_for_node_alive(_Node, 0)->
+wait_for_node_alive(_Node, 0) ->
     pang;
-wait_for_node_alive(Node, N)->
+wait_for_node_alive(Node, N) ->
     timer:sleep(1000),
     case net_adm:ping(Node) of
 	pong->
@@ -422,14 +422,14 @@ wait_for_node_alive(Node, N)->
     end.
 
 % call init:stop on a remote node
-do_stop(ENode)->
+do_stop(ENode) ->
     spawn(ENode, init, stop, []),
     wait_for_node_dead(ENode, 5).
 
 % wait N seconds until node is disconnected
-wait_for_node_dead(Node, 0)->
+wait_for_node_dead(Node, 0) ->
     {error, stop_timeout, Node};
-wait_for_node_dead(Node, N)->
+wait_for_node_dead(Node, N) ->
     timer:sleep(1000),
     case lists:member(Node, nodes()) of
 	true->