aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct_util.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-12-08 17:16:49 +0100
committerLukas Larsson <[email protected]>2010-12-08 18:08:28 +0100
commit8ed5c47ca047405b2c00a979a8567412e5283322 (patch)
treeb934eaf290cb2dd3249ff2bc81ddff8079b9710d /lib/common_test/src/ct_util.erl
parent8b33f2edabbfd684e619238bbfaa10cc16e2a0a7 (diff)
downloadotp-8ed5c47ca047405b2c00a979a8567412e5283322.tar.gz
otp-8ed5c47ca047405b2c00a979a8567412e5283322.tar.bz2
otp-8ed5c47ca047405b2c00a979a8567412e5283322.zip
Add so that failures in SCB:init/1 causes the entire scb scope to fail
Diffstat (limited to 'lib/common_test/src/ct_util.erl')
-rw-r--r--lib/common_test/src/ct_util.erl10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index fddeff881e..2f5a90a543 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -163,8 +163,14 @@ do_start(Parent,Mode,LogDir) ->
{StartTime,TestLogDir} = ct_logs:init(Mode),
%% Initiate suite_callbacks
- ok = ct_suite_callback:init(Opts),
-
+ case catch ct_suite_callback:init(Opts) of
+ ok ->
+ ok;
+ {_,SCBReason} ->
+ ct_logs:tc_print('Suite Callback',SCBReason,[]),
+ Parent ! {self(), SCBReason},
+ self() ! {{stop,normal},{self(),make_ref()}}
+ end,
ct_event:notify(#event{name=test_start,
node=node(),