aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erix.ericsson.se>2011-02-14 16:07:05 +0100
committerLukas Larsson <lukas@erix.ericsson.se>2011-02-14 16:07:05 +0100
commita5c92f814fd5c59ec219b83f9af8826f5f046962 (patch)
tree9061764e9c2aacb72bb0e5f6607daac48955fb33
parentae7e427471b4798a94bf030b3261a46a7df898df (diff)
downloadotp-a5c92f814fd5c59ec219b83f9af8826f5f046962.tar.gz
otp-a5c92f814fd5c59ec219b83f9af8826f5f046962.tar.bz2
otp-a5c92f814fd5c59ec219b83f9af8826f5f046962.zip
Fix bug with subgroups after introduction of remote groups
-rw-r--r--lib/common_test/src/ct_framework.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 3050aec0c5..0d82a106d5 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -756,8 +756,9 @@ find(Mod, Name, TCs, [{Name,Props,Tests} | _Gs], Known, Defs, false)
find(Mod, Name, TCs, [{Name1,Props,Tests} | Gs], Known, Defs, false)
when is_atom(Name1), is_list(Props), is_list(Tests) ->
cyclic_test(Mod, Name1, Known),
- find(Mod, Name, TCs, Tests, [Name1 | Known], Defs, false) ++
- find(Mod, Name, TCs, Gs, [], Defs, false);
+ [make_conf(Mod,Name1,Props,
+ find(Mod, Name, TCs, Tests, [Name1 | Known], Defs, false)) |
+ find(Mod, Name, TCs, Gs, [], Defs, false)];
find(Mod, Name, _TCs, [{Name,_Props,_Tests} | _Gs], _Known, _Defs, true)
when is_atom(Name) ->