aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-03-23 16:32:03 +0100
committerLukas Larsson <[email protected]>2012-03-23 16:32:03 +0100
commitbb8e2844a5714ef29247d558ff0d71d5f944ad82 (patch)
tree57d69db6cd7af9a2b636221e3772650ff40ee68a
parent0fa4703b49ce7b00c4d90bc1cdf8d195e6f38f00 (diff)
parent158b7744435e6f8500825b60f9002b5bf0639d6b (diff)
downloadotp-bb8e2844a5714ef29247d558ff0d71d5f944ad82.tar.gz
otp-bb8e2844a5714ef29247d558ff0d71d5f944ad82.tar.bz2
otp-bb8e2844a5714ef29247d558ff0d71d5f944ad82.zip
Merge branch 'maint'
* maint: 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,