From 0ae290cce8a3e54458efa1b212f154e6473b0288 Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Tue, 11 Feb 2014 17:21:35 +0100
Subject: Fix problem with verification for parallel groups in ct_telnet_SUITE

---
 lib/common_test/test/ct_telnet_SUITE.erl | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/lib/common_test/test/ct_telnet_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE.erl
index 25debf09d4..acce4eca14 100644
--- a/lib/common_test/test/ct_telnet_SUITE.erl
+++ b/lib/common_test/test/ct_telnet_SUITE.erl
@@ -215,23 +215,18 @@ all_cases(Suite,Config) ->
 	  fun({group,G}) ->
 		  {value,{G,Props,GTCs}} =
 		      lists:keysearch(G,1,Suite:groups()),
-		  GTCs1 = case lists:member(parallel,Props) of
-			      true ->
-				  %%! TEMPORARY WORKAROUND FOR PROBLEM
-				  %%! WITH ct_test_support NOT HANDLING
-				  %%! VERIFICATION OF PARALLEL GROUPS
-				  %%! CORRECTLY!
-				  [];
-			      false ->
-				  [[{?eh,tc_start,{Suite,GTC}},
-				    {?eh,tc_done,{Suite,GTC,ok}}] ||
-				      GTC <- GTCs]
-			  end,
-		  [{?eh,tc_start,{Suite,{init_per_group,G,Props}}},
-		   {?eh,tc_done,{Suite,{init_per_group,G,Props},ok}} |
-		   GTCs1] ++
-		      [{?eh,tc_start,{Suite,{end_per_group,G,Props}}},
-		       {?eh,tc_done,{Suite,{end_per_group,G,Props},ok}}];
+		  GTCs1 = [[{?eh,tc_start,{Suite,GTC}},
+			    {?eh,tc_done,{Suite,GTC,ok}}] ||
+			      GTC <- GTCs],
+		  GEvs = [{?eh,tc_start,{Suite,{init_per_group,G,Props}}},
+			  {?eh,tc_done,{Suite,{init_per_group,G,Props},ok}} |
+			  GTCs1] ++
+		         [{?eh,tc_start,{Suite,{end_per_group,G,Props}}},
+			  {?eh,tc_done,{Suite,{end_per_group,G,Props},ok}}],
+		  case lists:member(parallel, Props) of
+		      true -> [{parallel,GEvs}];
+		      false -> GEvs
+		  end;
 	     (TC) ->
 		  [{?eh,tc_done,{Suite,TC,ok}}]
 	  end, GroupsAndTCs),
-- 
cgit v1.2.3