aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2014-01-28 19:47:41 +0100
committerPeter Andersson <[email protected]>2014-01-28 19:47:41 +0100
commitf8af45981ec188e95205233f2df9e5e596139fac (patch)
tree62409217daf2e912c31e47d63ee677903cc9bfd5 /lib/common_test
parentc5079569ec2c6248f702b15c0e95def24411ca3c (diff)
downloadotp-f8af45981ec188e95205233f2df9e5e596139fac.tar.gz
otp-f8af45981ec188e95205233f2df9e5e596139fac.tar.bz2
otp-f8af45981ec188e95205233f2df9e5e596139fac.zip
Make temporary fix of problem that sometimes causes the ct_util server to die
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/src/ct_framework.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index e81b69a1b5..54510a657a 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -730,9 +730,14 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
(undefined) ->
undefined;
(Unexpected) ->
- exit({error,{reset_curr_tc,{Mod,Func},Unexpected}})
+ {error,{reset_curr_tc,{Mod,Func},Unexpected}}
end,
- ct_util:update_testdata(curr_tc, ClearCurrTC),
+ case ct_util:update_testdata(curr_tc, ClearCurrTC) of
+ {error,_} = ClearError ->
+ exit(ClearError);
+ _ ->
+ ok
+ end,
case FinalResult of
{auto_skip,{sequence_failed,_,_}} ->