diff options
| author | Björn Gustavsson <[email protected]> | 2012-11-08 14:49:36 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-11-08 14:49:36 +0100 |
| commit | a1ba0ade00a08968d289912c8a8b709417ba80c5 (patch) | |
| tree | c41db49405fe6b9d905abbe059d4ecf286d0072d /lib/common_test/src | |
| parent | 27cadfdfb196d29cc237a7938fe97671d40264a6 (diff) | |
| parent | f816de97c1fdbb96ca09a8980dab32ad2e1785e7 (diff) | |
| download | otp-a1ba0ade00a08968d289912c8a8b709417ba80c5.tar.gz otp-a1ba0ade00a08968d289912c8a8b709417ba80c5.tar.bz2 otp-a1ba0ade00a08968d289912c8a8b709417ba80c5.zip | |
Merge branch 'bjorn/ct/minor-corrections'
* bjorn/ct/minor-corrections:
test_server_io: Correct a few comments
Handle ct:abort_current_testcase/1 when executing parallel groups
Make sure that "Cover analysing..." is written to stdout
Make sure that "Testing..." is not written if testing has finished
Diffstat (limited to 'lib/common_test/src')
| -rw-r--r-- | lib/common_test/src/ct.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl index 90e4e79ccf..6ecd0a022c 100644 --- a/lib/common_test/src/ct.erl +++ b/lib/common_test/src/ct.erl @@ -987,8 +987,9 @@ get_testdata(Key) -> end. %%%----------------------------------------------------------------- -%%% @spec abort_current_testcase(Reason) -> ok | {error,no_testcase_running} +%%% @spec abort_current_testcase(Reason) -> ok | {error,ErrorReason} %%% Reason = term() +%%% ErrorReason = no_testcase_running | parallel_group %%% %%% @doc <p>When calling this function, the currently executing test case will be aborted. %%% It is the user's responsibility to know for sure which test case is currently |