diff options
author | Peter Andersson <[email protected]> | 2012-08-28 11:04:18 +0200 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2012-08-28 11:04:18 +0200 |
commit | ee5133a635f08409fc0e943ea79145bc36acbe4f (patch) | |
tree | ea6ab67104d33cbfa5ce0100da0c3d35e87f9fba /lib/common_test/test/ct_testspec_2_SUITE.erl | |
parent | 3a354d40ed3ef0604e1caf78f8995e01de3c8b89 (diff) | |
parent | 701315c4fabb5cefc377533198588a85a0fd1417 (diff) | |
download | otp-ee5133a635f08409fc0e943ea79145bc36acbe4f.tar.gz otp-ee5133a635f08409fc0e943ea79145bc36acbe4f.tar.bz2 otp-ee5133a635f08409fc0e943ea79145bc36acbe4f.zip |
Merge remote branch 'origin/peppe/common_test/break_cont_error' into maint
* origin/peppe/common_test/break_cont_error:
Make sure the test can never hang when ct:break/1/2 is called
Diffstat (limited to 'lib/common_test/test/ct_testspec_2_SUITE.erl')
-rw-r--r-- | lib/common_test/test/ct_testspec_2_SUITE.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/common_test/test/ct_testspec_2_SUITE.erl b/lib/common_test/test/ct_testspec_2_SUITE.erl index 681387c745..411529b52a 100644 --- a/lib/common_test/test/ct_testspec_2_SUITE.erl +++ b/lib/common_test/test/ct_testspec_2_SUITE.erl @@ -91,7 +91,7 @@ all() -> %% {ct_hooks,2} %% {ct_hooks,3} %% {enable_builtin_hooks,2} -%% {noinput,2} +%% {release_shell,2} %% {multiply_timetraps,2} %% {multiply_timetraps,3} %% {scale_timetraps,2} @@ -198,7 +198,7 @@ basic_compatible_no_nodes(_Config) -> ct_hooks = [{Node,{cth_mod1,[]}}, {Node,{cth_mod2,[]}}], enable_builtin_hooks = true, - noinput = false, + release_shell = false, include = Incls, auto_compile = [], stylesheet = [], @@ -325,7 +325,7 @@ basic_compatible_nodes(_Config) -> {Node1,{cth_mod2,[]}}, {Node2,{cth_mod2,[]}}], enable_builtin_hooks = true, - noinput = false, + release_shell = false, include = Incls, auto_compile = [], stylesheet = [], @@ -542,7 +542,7 @@ misc_config_terms(_Config) -> {enable_builtin_hooks,false}, - {noinput,true}, + {release_shell,true}, {auto_compile,false}, {auto_compile,n1@h1,true}, @@ -590,7 +590,7 @@ misc_config_terms(_Config) -> {n1@h1,CfgD}, {n2@h2,CfgD}], enable_builtin_hooks = false, - noinput = true, + release_shell = true, auto_compile = [{Node,false}, {n1@h1,true}, {n2@h2,false}], |