diff options
| author | Peter Andersson <[email protected]> | 2012-03-20 01:29:02 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-03-21 11:41:57 +0100 |
| commit | c2a3647e471bb08de24d867bc7c3f541e2f7a15d (patch) | |
| tree | 248e157a67cd4d6322bc5b6585e930a532598a7f /lib/common_test/src/ct_framework.erl | |
| parent | afe7a29a54a7958ac90e44b3bee6c572792bb96b (diff) | |
| download | otp-c2a3647e471bb08de24d867bc7c3f541e2f7a15d.tar.gz otp-c2a3647e471bb08de24d867bc7c3f541e2f7a15d.tar.bz2 otp-c2a3647e471bb08de24d867bc7c3f541e2f7a15d.zip | |
Implement support for user controlled timetraps
OTP-9988
Diffstat (limited to 'lib/common_test/src/ct_framework.erl')
| -rw-r--r-- | lib/common_test/src/ct_framework.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl index 187794e78b..c8aff3c039 100644 --- a/lib/common_test/src/ct_framework.erl +++ b/lib/common_test/src/ct_framework.erl @@ -212,7 +212,7 @@ init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) -> {auto_skip,{require_failed,Reason}}; {'EXIT',Reason} -> {auto_skip,Reason}; - {ok,FinalConfig} -> + {ok,Config1} -> case MergeResult of {error,Reason} -> %% suite0 configure finished now, report that @@ -221,9 +221,9 @@ init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) -> _ -> case get('$test_server_framework_test') of undefined -> - ct_suite_init(Suite, FuncSpec, FinalConfig); + ct_suite_init(Mod, FuncSpec, Config1); Fun -> - case Fun(init_tc, FinalConfig) of + case Fun(init_tc, Config1) of NewConfig when is_list(NewConfig) -> {ok,NewConfig}; Else -> |