aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct_run.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-04-17 10:07:55 +0200
committerPeter Andersson <[email protected]>2013-04-17 10:09:02 +0200
commit6df14788a8b62de478d636a4412ec94ebe136713 (patch)
treeb7090083c49c44559901946246ba7e9ed131fc2e /lib/common_test/src/ct_run.erl
parentd988c8ebc8ec0349413a99ce1296905f83d87546 (diff)
parenta2604872aebcd70c94419c27b7a5c4750c6a4712 (diff)
downloadotp-6df14788a8b62de478d636a4412ec94ebe136713.tar.gz
otp-6df14788a8b62de478d636a4412ec94ebe136713.tar.bz2
otp-6df14788a8b62de478d636a4412ec94ebe136713.zip
Merge branch 'peppe/common_test/log_cache' into maint
* peppe/common_test/log_cache: Implement cache for the CT logger OTP-10855
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
-rw-r--r--lib/common_test/src/ct_run.erl14
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),