diff options
| author | Peter Andersson <[email protected]> | 2014-03-25 11:13:21 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2014-03-25 11:13:21 +0100 |
| commit | fa2641c8089dc6850b2b176b0f195d9d9fcd7687 (patch) | |
| tree | 7eb147c38bc1b7408b9b6d550289f0486d75386b /lib/common_test/src/ct_framework.erl | |
| parent | 26bdb6c47ef7f2222ebe195284506fb6704d104c (diff) | |
| parent | f7abe0185ce2bb091945aae469dcc3b6d2909c0c (diff) | |
| download | otp-fa2641c8089dc6850b2b176b0f195d9d9fcd7687.tar.gz otp-fa2641c8089dc6850b2b176b0f195d9d9fcd7687.tar.bz2 otp-fa2641c8089dc6850b2b176b0f195d9d9fcd7687.zip | |
Merge branch 'peppe/common_test/dialyzer_warnings'
* peppe/common_test/dialyzer_warnings:
Update incorrect type specifications
Fix code to get rid of dialyzer warnings
Remove dead code
Diffstat (limited to 'lib/common_test/src/ct_framework.erl')
| -rw-r--r-- | lib/common_test/src/ct_framework.erl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl index 63bfea68c4..7d577462b0 100644 --- a/lib/common_test/src/ct_framework.erl +++ b/lib/common_test/src/ct_framework.erl @@ -249,8 +249,8 @@ init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) -> end end. -ct_suite_init(Suite, Func, PostInitHook, Config) when is_list(Config) -> - case ct_hooks:init_tc(Suite, Func, Config) of +ct_suite_init(Suite, FuncSpec, PostInitHook, Config) when is_list(Config) -> + case ct_hooks:init_tc(Suite, FuncSpec, Config) of NewConfig when is_list(NewConfig) -> PostInitHookResult = do_post_init_hook(PostInitHook, NewConfig), {ok, [PostInitHookResult ++ NewConfig]}; @@ -660,10 +660,7 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) -> ct_util:delete_testdata(comment), ct_util:delete_suite_data(last_saved_config), - FuncSpec = case group_or_func(Func,Args) of - {_,_GroupName,_} = Group -> Group; - _ -> Func - end, + FuncSpec = group_or_func(Func,Args), {Result1,FinalNotify} = case ct_hooks:end_tc( |