aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct_config.erl
diff options
context:
space:
mode:
authorAndrey Pampukha <[email protected]>2010-03-09 15:10:22 +0100
committerRaimo Niskanen <[email protected]>2010-06-09 16:19:10 +0200
commit5b66bed40bd374dfcaa5e5669adf338734d812a3 (patch)
treeba6d9b2c52da15664d27f43aa2b6b76522e38fd6 /lib/common_test/src/ct_config.erl
parent3c3360947692d8cf55d6dc2290934ec111675cde (diff)
downloadotp-5b66bed40bd374dfcaa5e5669adf338734d812a3.tar.gz
otp-5b66bed40bd374dfcaa5e5669adf338734d812a3.tar.bz2
otp-5b66bed40bd374dfcaa5e5669adf338734d812a3.zip
Add test suites for configuration
Diffstat (limited to 'lib/common_test/src/ct_config.erl')
-rwxr-xr-xlib/common_test/src/ct_config.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index 8e2f71647f..bc57930381 100755
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -198,13 +198,13 @@ get_config_file_list(Opts)->
DefaultConfigs == []->
[];
true->
- [{ct_config_plain, DefaultConfigs}]
+ [{?ct_config_txt, DefaultConfigs}]
end ++
process_user_configs(Opts, []),
CfgFiles.
read_config_files(Opts) ->
- ct:pal("ct_config:read_config_files/1:~nOpts:~n~p", [Opts]),
+ %ct:pal("ct_config:read_config_files/1:~nOpts:~n~p", [Opts]),
AddCallback = fun(CallBack, [])->
[{CallBack, []}];
(CallBack, Files)->
@@ -220,7 +220,7 @@ read_config_files(Opts) ->
false->
[]
end,
- ct:pal("ct_config:read_config_files/1:~nConfigFiles:~n~p", [ConfigFiles]),
+ %ct:pal("ct_config:read_config_files/1:~nConfigFiles:~n~p", [ConfigFiles]),
read_config_files_int(ConfigFiles, fun store_config/3).
read_config_files_int([{Callback, File}|Files], FunToSave)->
@@ -687,7 +687,7 @@ check_callback_load(Callback)->
end.
check_config_files(Configs)->
- ct:pal("ct_config:check_config_files(~p)", [Configs]),
+ ct:pal("ct_config:check_config_files/1~nConfigs:~n~p", [Configs]),
lists:keysearch(nok, 1,
lists:flatten(
lists:map(fun({Callback, Files})->
@@ -719,7 +719,7 @@ prepare_user_configs([], Acc, _)->
prepare_config_list(Args)->
ConfigFiles = case lists:keysearch(ct_config, 1, Args) of
{value,{ct_config,Files}}->
- [{ct_config_plain, Files}];
+ [{?ct_config_txt, Files}];
false->
[]
end,