aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/cth_surefire.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-08-27 12:03:10 +0200
committerPeter Andersson <[email protected]>2012-08-27 12:03:10 +0200
commit5472a54b7f952c08e794eb52175d3724cc2937db (patch)
treef5902094a99b51c710db28750c9ef61a1563f22c /lib/common_test/src/cth_surefire.erl
parent30e714a61860745769f4f2eab0f5cb5e0d4dc947 (diff)
parent00455b5fec96bf320fc8b3656bb9dbd0395fa23b (diff)
downloadotp-5472a54b7f952c08e794eb52175d3724cc2937db.tar.gz
otp-5472a54b7f952c08e794eb52175d3724cc2937db.tar.bz2
otp-5472a54b7f952c08e794eb52175d3724cc2937db.zip
Merge remote branch 'origin/peppe/common_test/misc_test_failures' into maint
* origin/peppe/common_test/misc_test_failures: Solve problem with registering parallel testcases
Diffstat (limited to 'lib/common_test/src/cth_surefire.erl')
-rw-r--r--lib/common_test/src/cth_surefire.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/src/cth_surefire.erl b/lib/common_test/src/cth_surefire.erl
index e7bd84e51b..76b0f0b5ea 100644
--- a/lib/common_test/src/cth_surefire.erl
+++ b/lib/common_test/src/cth_surefire.erl
@@ -92,7 +92,7 @@ on_tc_fail(_TC, Res, State) ->
{fail,lists:flatten(io_lib:format("~p",[Res]))} },
State#state{ test_cases = [NewTC | tl(TCs)]}.
-on_tc_skip(Tc,{Type,Reason} = Res, State) when Type == tc_auto_skip ->
+on_tc_skip(Tc,{Type,_Reason} = Res, State) when Type == tc_auto_skip ->
do_tc_skip(Res, end_tc(Tc,[],Res,init_tc(State,[])));
on_tc_skip(_Tc, _Res, State = #state{test_cases = []}) ->
State;