aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-10-31 16:49:59 +0100
committerPeter Andersson <[email protected]>2013-10-31 16:49:59 +0100
commit759a1f6240117cf64eecac26c21f82de0e877332 (patch)
tree6cb1d8ce57027bf0be6cef28f13c00a72750a217 /lib/common_test/src
parenta811257b11a5c7833047e00c676aca00860161fe (diff)
downloadotp-759a1f6240117cf64eecac26c21f82de0e877332.tar.gz
otp-759a1f6240117cf64eecac26c21f82de0e877332.tar.bz2
otp-759a1f6240117cf64eecac26c21f82de0e877332.zip
Fix problem with handling Config and FW reports correctly
Diffstat (limited to 'lib/common_test/src')
-rw-r--r--lib/common_test/src/ct_framework.erl14
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 276f902b05..76516e6a72 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -1256,14 +1256,20 @@ report(What,Data) ->
{_,{SkipOrFail,_Reason}} ->
add_to_stats(SkipOrFail)
end;
- tc_user_skip ->
- %% test case specified as skipped in testspec
+ tc_user_skip ->
+ %% test case specified as skipped in testspec, or init
+ %% config func for suite/group has returned {skip,Reason}
%% Data = {Suite,Case,Comment}
ct_event:sync_notify(#event{name=tc_user_skip,
node=node(),
data=Data}),
- ct_hooks:on_tc_skip(What, Data),
- add_to_stats(user_skipped);
+ case Data of
+ {_,Func,_} when Func /= end_per_suite, Func /= end_per_group ->
+ ct_hooks:on_tc_skip(What, Data),
+ add_to_stats(user_skipped);
+ _ ->
+ ok
+ end;
tc_auto_skip ->
%% test case skipped because of error in init_per_suite
%% Data = {Suite,Case,Comment}