aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test/ct_surefire_SUITE.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-11-28 17:38:41 +0100
committerPeter Andersson <[email protected]>2013-11-28 17:38:41 +0100
commita4565bd7d6e8362b3ca1ff0caedf7407e81d67cb (patch)
tree056af044a1103d1d3f6c9df5bf2992a02b8fc48c /lib/common_test/test/ct_surefire_SUITE.erl
parent23a30d882464df4210ea53096ea50e7b44876812 (diff)
parentac7902caa784d4f4c73eb7291ab4736a75ad13a4 (diff)
downloadotp-a4565bd7d6e8362b3ca1ff0caedf7407e81d67cb.tar.gz
otp-a4565bd7d6e8362b3ca1ff0caedf7407e81d67cb.tar.bz2
otp-a4565bd7d6e8362b3ca1ff0caedf7407e81d67cb.zip
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/test/ct_surefire_SUITE.erl')
-rw-r--r--lib/common_test/test/ct_surefire_SUITE.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/common_test/test/ct_surefire_SUITE.erl b/lib/common_test/test/ct_surefire_SUITE.erl
index b86b47f0a2..c5e44682b0 100644
--- a/lib/common_test/test/ct_surefire_SUITE.erl
+++ b/lib/common_test/test/ct_surefire_SUITE.erl
@@ -182,7 +182,7 @@ test_events(_) ->
{?eh,test_stats,{1,1,{1,0}}},
{?eh,tc_start,{surefire_SUITE,tc_autoskip_require}},
{?eh,tc_done,{surefire_SUITE,tc_autoskip_require,
- {skipped,{require_failed,'_'}}}},
+ {auto_skipped,{require_failed,'_'}}}},
{?eh,test_stats,{1,1,{1,1}}},
[{?eh,tc_start,{surefire_SUITE,{init_per_group,g,[]}}},
{?eh,tc_done,{surefire_SUITE,{init_per_group,g,[]},ok}},
@@ -198,7 +198,7 @@ test_events(_) ->
{?eh,test_stats,{2,2,{2,1}}},
{?eh,tc_start,{surefire_SUITE,tc_autoskip_require}},
{?eh,tc_done,{surefire_SUITE,tc_autoskip_require,
- {skipped,{require_failed,'_'}}}},
+ {auto_skipped,{require_failed,'_'}}}},
{?eh,test_stats,{2,2,{2,2}}},
{?eh,tc_start,{surefire_SUITE,{end_per_group,g,[]}}},
{?eh,tc_done,{surefire_SUITE,{end_per_group,g,[]},ok}}],
@@ -210,7 +210,7 @@ test_events(_) ->
{surefire_SUITE,init_per_group,
{'EXIT',all_cases_should_be_skipped}}}}},
{?eh,test_stats,{2,2,{2,3}}},
- {?eh,tc_auto_skip,{surefire_SUITE,end_per_group,
+ {?eh,tc_auto_skip,{surefire_SUITE,{end_per_group,g_fail},
{failed,
{surefire_SUITE,init_per_group,
{'EXIT',all_cases_should_be_skipped}}}}}],
@@ -328,6 +328,7 @@ events_to_result([]) ->
result(ok) ->[];
result({skipped,_}) -> [s];
+result({auto_skipped,_}) -> [s];
result({failed,_}) -> [f].
%% Using the expected events' last test_stats element to produce the