diff options
| author | Peter Andersson <[email protected]> | 2013-04-17 10:11:23 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-04-17 10:11:23 +0200 |
| commit | 099f2344b5d3d680a62091e50dd645da8dd320da (patch) | |
| tree | 1ffddd3b0c185d7f9d7fa0e186e7cb2ef32b1f7b /lib/common_test/src/ct_run.erl | |
| parent | 31a53000f8dc50f93b93bdd02f2b1c1072dc8cbe (diff) | |
| parent | 6df14788a8b62de478d636a4412ec94ebe136713 (diff) | |
| download | otp-099f2344b5d3d680a62091e50dd645da8dd320da.tar.gz otp-099f2344b5d3d680a62091e50dd645da8dd320da.tar.bz2 otp-099f2344b5d3d680a62091e50dd645da8dd320da.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
| -rw-r--r-- | lib/common_test/src/ct_run.erl | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index 57cfab532e..41d53c7b43 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -329,6 +329,13 @@ script_start1(Parent, Args) -> application:set_env(common_test, basic_html, true), true end, + %% disable_log_cache - used by ct_logs + case proplists:get_value(disable_log_cache, Args) of + undefined -> + application:set_env(common_test, disable_log_cache, false); + _ -> + application:set_env(common_test, disable_log_cache, true) + end, Opts = #opts{label = Label, profile = Profile, vts = Vts, shell = Shell, @@ -1039,6 +1046,13 @@ run_test2(StartOpts) -> BasicHtmlBool end, + case proplists:get_value(disable_log_cache, StartOpts) of + undefined -> + application:set_env(common_test, disable_log_cache, false); + DisableCacheBool -> + application:set_env(common_test, disable_log_cache, DisableCacheBool) + end, + %% stepped execution Step = get_start_opt(step, value, StartOpts), |