diff options
| author | Peter Andersson <[email protected]> | 2012-08-23 16:38:19 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-08-23 16:38:19 +0200 |
| commit | 182564757661d6cd507d2e92d175c61602a25394 (patch) | |
| tree | d64c68c681706dba93d1ce6ab16998419b57d184 /lib/common_test/src/ct_config.erl | |
| parent | 4173064b7044d72f650cf459683793acc9e29352 (diff) | |
| parent | b337ca6109902c4713016d2ab366c0bfb6cc1a2e (diff) | |
| download | otp-182564757661d6cd507d2e92d175c61602a25394.tar.gz otp-182564757661d6cd507d2e92d175c61602a25394.tar.bz2 otp-182564757661d6cd507d2e92d175c61602a25394.zip | |
Merge remote branch 'origin/peppe/common_test/verbosity_level' into maint
* origin/peppe/common_test/verbosity_level:
Fix doc build error
Implement verbosity levels and parameter for log printout importance
Conflicts:
lib/common_test/src/ct_logs.erl
lib/common_test/src/ct_run.erl
lib/common_test/src/ct_testspec.erl
lib/common_test/src/ct_util.hrl
lib/common_test/test/Makefile
OTP-9625
OTP-10067
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); |