diff options
| author | Peter Andersson <[email protected]> | 2012-08-23 16:39:57 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-08-23 16:39:57 +0200 |
| commit | 2f32d6fd9305a17b8f61280a6834ce68b2e85fc8 (patch) | |
| tree | f591e7e9aaea07bd4b3b3ccfc76b9dca21d39878 /lib/common_test/src/ct_config.erl | |
| parent | 9db2abbe92a61f3dd8f269bc4deabb68b9176662 (diff) | |
| parent | 182564757661d6cd507d2e92d175c61602a25394 (diff) | |
| download | otp-2f32d6fd9305a17b8f61280a6834ce68b2e85fc8.tar.gz otp-2f32d6fd9305a17b8f61280a6834ce68b2e85fc8.tar.bz2 otp-2f32d6fd9305a17b8f61280a6834ce68b2e85fc8.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/ct_config.erl')
| -rw-r--r-- | lib/common_test/src/ct_config.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl index 9277af5bc1..c585fe0995 100644 --- a/lib/common_test/src/ct_config.erl +++ b/lib/common_test/src/ct_config.erl @@ -760,13 +760,13 @@ check_config_files(Configs) -> end, lists:keysearch(error, 1, lists:flatten(lists:map(ConfigChecker, Configs))). -prepare_user_configs([ConfigString|UserConfigs], Acc, new) -> +prepare_user_configs([CallbackMod|UserConfigs], Acc, new) -> prepare_user_configs(UserConfigs, - [{list_to_atom(ConfigString), []}|Acc], + [{list_to_atom(CallbackMod),[]}|Acc], cur); prepare_user_configs(["and"|UserConfigs], Acc, _) -> prepare_user_configs(UserConfigs, Acc, new); -prepare_user_configs([ConfigString|UserConfigs], [{LastMod, LastList}|Acc], cur) -> +prepare_user_configs([ConfigString|UserConfigs], [{LastMod,LastList}|Acc], cur) -> prepare_user_configs(UserConfigs, [{LastMod, [ConfigString|LastList]}|Acc], cur); |