diff options
| author | Lukas Larsson <[email protected]> | 2010-12-07 19:14:03 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2010-12-08 18:08:28 +0100 |
| commit | 8b33f2edabbfd684e619238bbfaa10cc16e2a0a7 (patch) | |
| tree | 0ce421dbc6c82cd4aeaefbe0b0f8afac94f2ca09 /lib/common_test/src/ct_framework.erl | |
| parent | 6288b704f2ee0699407f645536ad69e0dd07756d (diff) | |
| download | otp-8b33f2edabbfd684e619238bbfaa10cc16e2a0a7.tar.gz otp-8b33f2edabbfd684e619238bbfaa10cc16e2a0a7.tar.bz2 otp-8b33f2edabbfd684e619238bbfaa10cc16e2a0a7.zip | |
Fix bug which caused scb to be added too much when initiated in the suite info function
Diffstat (limited to 'lib/common_test/src/ct_framework.erl')
| -rw-r--r-- | lib/common_test/src/ct_framework.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl index dbf367e4d8..d05c30f5e1 100644 --- a/lib/common_test/src/ct_framework.erl +++ b/lib/common_test/src/ct_framework.erl @@ -251,7 +251,9 @@ add_defaults(Mod,Func,FuncInfo,DoInit) -> (_) -> false end, SuiteInfo) of true -> - SuiteInfo1 = merge_with_suite_defaults(Mod,SuiteInfo), + SuiteInfoNoSCB = + lists:keydelete(suite_callbacks,1,SuiteInfo), + SuiteInfo1 = merge_with_suite_defaults(Mod,SuiteInfoNoSCB), case add_defaults1(Mod,Func,FuncInfo,SuiteInfo1,DoInit) of Error = {error,_} -> {SuiteInfo1,Error}; MergedInfo -> {SuiteInfo1,MergedInfo} |