diff options
author | Lukas Larsson <[email protected]> | 2010-09-10 14:11:46 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2010-09-10 14:11:46 +0200 |
commit | e5bcc889833a47d03fd427573ee0551977353f24 (patch) | |
tree | fb044b3ce8c157e3015eb4ae14be94500fb2bad4 /lib/common_test/src/ct_run.erl | |
parent | 96e0071c520f230025126efcf69fb42c7bf7f685 (diff) | |
parent | 48c754b93da2eff262b2297f2e51b102adbabfa0 (diff) | |
download | otp-e5bcc889833a47d03fd427573ee0551977353f24.tar.gz otp-e5bcc889833a47d03fd427573ee0551977353f24.tar.bz2 otp-e5bcc889833a47d03fd427573ee0551977353f24.zip |
Merge branch 'lukas/common_test/default_ct_config/OTP-8818' into dev
* lukas/common_test/default_ct_config/OTP-8818:
OTP-8818: Fixed inconsistency in ct:start_interactive call
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
-rw-r--r-- | lib/common_test/src/ct_run.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index c5bfd01642..c14f0c5cee 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -550,6 +550,9 @@ install(Opts) -> install(Opts, "."). install(Opts, LogDir) -> + + ConfOpts = ct_config:add_default_callback(Opts), + case application:get_env(common_test, decrypt) of {ok,_} -> ok; @@ -566,7 +569,7 @@ install(Opts, LogDir) -> VarFile = variables_file_name(LogDir), case file:open(VarFile, [write]) of {ok,Fd} -> - [io:format(Fd, "~p.\n", [Opt]) || Opt <- Opts], + [io:format(Fd, "~p.\n", [Opt]) || Opt <- ConfOpts ], file:close(Fd), ok; {error,Reason} -> |