aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-03-23 16:31:08 +0100
committerLukas Larsson <[email protected]>2012-03-23 16:31:08 +0100
commit158b7744435e6f8500825b60f9002b5bf0639d6b (patch)
tree930d9febe6269b619732a9dd191cd5ac0f0eda1e
parentb13b88779b3fbc0ef8bb91a17a5d064cd778e0fa (diff)
parent1a8f98fa674051cf973652ce16588420525de433 (diff)
downloadotp-158b7744435e6f8500825b60f9002b5bf0639d6b.tar.gz
otp-158b7744435e6f8500825b60f9002b5bf0639d6b.tar.bz2
otp-158b7744435e6f8500825b60f9002b5bf0639d6b.zip
Merge branch 'lukas/common_test/fix_disable_builtin_hooks_from_spec/OTP-10009' into maint
* lukas/common_test/fix_disable_builtin_hooks_from_spec/OTP-10009: Change default of enable builtin hooks to undefined Disable built in hooks for emulator
-rw-r--r--erts/emulator/test/emulator.spec1
-rw-r--r--lib/common_test/src/ct_run.erl8
2 files changed, 5 insertions, 4 deletions
diff --git a/erts/emulator/test/emulator.spec b/erts/emulator/test/emulator.spec
index 1ea751cc3b..7a6dd83020 100644
--- a/erts/emulator/test/emulator.spec
+++ b/erts/emulator/test/emulator.spec
@@ -1 +1,2 @@
+{enable_builtin_hooks, false}.
{suites,"../emulator_test",all}.
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 72124f6f21..717154667f 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -57,7 +57,7 @@
config = [],
event_handlers = [],
ct_hooks = [],
- enable_builtin_hooks = true,
+ enable_builtin_hooks,
include = [],
silent_connections,
stylesheet,
@@ -187,8 +187,8 @@ script_start1(Parent, Args) ->
CTHooks = ct_hooks_args2opts(Args),
EnableBuiltinHooks = get_start_opt(enable_builtin_hooks,
fun([CT]) -> list_to_atom(CT);
- ([]) -> true
- end, true, Args),
+ ([]) -> undefined
+ end, undefined, Args),
%% check flags and set corresponding application env variables
@@ -782,7 +782,7 @@ run_test2(StartOpts) ->
fun(EBH) when EBH == true;
EBH == false ->
EBH
- end, true, StartOpts),
+ end, undefined, StartOpts),
%% silent connections
SilentConns = get_start_opt(silent_connections,