aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-03-23 15:57:17 +0100
committerPeter Andersson <[email protected]>2012-03-23 15:57:17 +0100
commit5fd16511a1240220f0126f7be51f44aa38bcce56 (patch)
tree024e935cdf6bd070aec24b712dc3bc60dd53c71d
parent88c935d87a9878016e07b5a3f42bc8efe30b1eea (diff)
parent07481665da8b71ce75e70eca62f8b980179d360c (diff)
downloadotp-5fd16511a1240220f0126f7be51f44aa38bcce56.tar.gz
otp-5fd16511a1240220f0126f7be51f44aa38bcce56.tar.bz2
otp-5fd16511a1240220f0126f7be51f44aa38bcce56.zip
Merge branch 'peppe/common_test/otp-9871' into peppe/common_test/otp-9988_9871.merged
Conflicts: lib/common_test/src/ct_framework.erl
-rw-r--r--lib/common_test/src/ct_framework.erl33
1 files changed, 11 insertions, 22 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index c8aff3c039..e4fbf95fdd 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -213,22 +213,15 @@ init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) ->
{'EXIT',Reason} ->
{auto_skip,Reason};
{ok,Config1} ->
- case MergeResult of
- {error,Reason} ->
- %% suite0 configure finished now, report that
- %% first test case actually failed
- {skip,Reason};
- _ ->
- case get('$test_server_framework_test') of
- undefined ->
- ct_suite_init(Mod, FuncSpec, Config1);
- Fun ->
- case Fun(init_tc, Config1) of
- NewConfig when is_list(NewConfig) ->
- {ok,NewConfig};
- Else ->
- Else
- end
+ case get('$test_server_framework_test') of
+ undefined ->
+ ct_suite_init(Suite, FuncSpec, Config1);
+ Fun ->
+ case Fun(init_tc, Config1) of
+ NewConfig when is_list(NewConfig) ->
+ {ok,NewConfig};
+ Else ->
+ Else
end
end
end.
@@ -346,16 +339,12 @@ get_suite_name(Mod, _) ->
Mod.
%% Check that alias names are not already in use
-check_for_clashes(TCInfo, GrPathInfo, SuiteInfo) ->
- {CurrGrInfo,SearchIn} = case GrPathInfo of
- [] -> {[],[SuiteInfo]};
- [Curr|Path] -> {Curr,[SuiteInfo|Path]}
- end,
+check_for_clashes(TCInfo, [CurrGrInfo|Path], SuiteInfo) ->
ReqNames = fun(Info) -> [element(2,R) || R <- Info,
size(R) == 3,
require == element(1,R)]
end,
- ExistingNames = lists:flatten([ReqNames(L) || L <- SearchIn]),
+ ExistingNames = lists:flatten([ReqNames(L) || L <- [SuiteInfo|Path]]),
CurrGrReqNs = ReqNames(CurrGrInfo),
GrClashes = [Name || Name <- CurrGrReqNs,
true == lists:member(Name, ExistingNames)],