aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-11-17 16:59:34 +0100
committerLukas Larsson <[email protected]>2010-12-08 18:07:48 +0100
commitdc20d9d2538b60547c3cbfba1772b500a85302b8 (patch)
treeecf2bc7bf1dad5ed3b85e1b3935fa5d25361e08f
parent5bf3141144c48a0f560dd2cc9f95981ec0154e11 (diff)
downloadotp-dc20d9d2538b60547c3cbfba1772b500a85302b8.tar.gz
otp-dc20d9d2538b60547c3cbfba1772b500a85302b8.tar.bz2
otp-dc20d9d2538b60547c3cbfba1772b500a85302b8.zip
Update to be backward compatible with ct framework test funktionality
-rw-r--r--lib/common_test/src/ct_framework.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 08ee843597..ac10bddefc 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -218,7 +218,12 @@ init_tc2(Mod,Func,SuiteInfo,MergeResult,Config,DoInit) ->
undefined ->
ct_suite_init(Mod, FuncSpec, FinalConfig);
Fun ->
- Fun(init_tc, FinalConfig)
+ case Fun(init_tc, FinalConfig) of
+ NewConfig when is_list(NewConfig) ->
+ {ok,NewConfig};
+ Else ->
+ Else
+ end
end
end
end.