diff options
| author | Andrey Pampukha <[email protected]> | 2010-02-23 15:31:12 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-06-09 16:19:08 +0200 |
| commit | 8c79c17611c37217345e969aa2c344fe34e0375e (patch) | |
| tree | 039b29fe7826c728e882a95c5f1d51a63e4d5134 /lib/common_test/src/ct_config_plain.erl | |
| parent | fb0f87106861fcd45688a78dc587352d15f91a4a (diff) | |
| download | otp-8c79c17611c37217345e969aa2c344fe34e0375e.tar.gz otp-8c79c17611c37217345e969aa2c344fe34e0375e.tar.bz2 otp-8c79c17611c37217345e969aa2c344fe34e0375e.zip | |
Remove configuration handling from ct_util completely
Diffstat (limited to 'lib/common_test/src/ct_config_plain.erl')
| -rwxr-xr-x | lib/common_test/src/ct_config_plain.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_config_plain.erl b/lib/common_test/src/ct_config_plain.erl index a5947cafef..be0433aa9f 100755 --- a/lib/common_test/src/ct_config_plain.erl +++ b/lib/common_test/src/ct_config_plain.erl @@ -38,10 +38,10 @@ read_config_file(ConfigFile) -> {key,K} -> K; {file,F} -> - ct_util:get_crypt_key_from_file(F) + ct_config:get_crypt_key_from_file(F) end; _ -> - ct_util:get_crypt_key_from_file() + ct_config:get_crypt_key_from_file() end, case Key of {error,no_crypt_file} -> @@ -49,7 +49,7 @@ read_config_file(ConfigFile) -> {error,CryptError} -> {error, decrypt_file_error, CryptError}; _ when is_list(Key) -> - case ct_util:decrypt_config_file(ConfigFile, undefined, {key,Key}) of + case ct_config:decrypt_config_file(ConfigFile, undefined, {key,Key}) of {ok,CfgBin} -> case read_config_terms(CfgBin) of {error,ReadFail} -> |