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/src/ct_testspec.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/src/ct_testspec.erl')
| -rw-r--r-- | lib/common_test/src/ct_testspec.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl index de63ac3b75..a8b67d0329 100644 --- a/lib/common_test/src/ct_testspec.erl +++ b/lib/common_test/src/ct_testspec.erl @@ -779,8 +779,8 @@ add_tests([{event_handler,Node,HOrHs,Args}|Ts],Spec) -> add_tests([{enable_builtin_hooks,Bool}|Ts],Spec) -> add_tests(Ts, Spec#testspec{enable_builtin_hooks = Bool}); -add_tests([{noinput,Bool}|Ts],Spec) -> - add_tests(Ts, Spec#testspec{noinput = Bool}); +add_tests([{release_shell,Bool}|Ts],Spec) -> + add_tests(Ts, Spec#testspec{release_shell = Bool}); %% --- handled/errors --- add_tests([{define,_,_}|Ts],Spec) -> % handled @@ -1283,7 +1283,7 @@ valid_terms() -> {ct_hooks,2}, {ct_hooks,3}, {enable_builtin_hooks,2}, - {noinput,2}, + {release_shell,2}, {multiply_timetraps,2}, {multiply_timetraps,3}, {scale_timetraps,2}, |