aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-12-04 20:20:40 +0100
committerPeter Andersson <[email protected]>2013-12-04 20:21:30 +0100
commitcf9a0698142d03e5c32711926e81da4fba718b5a (patch)
treedaaecceebc12244d4178ca4fd247951defef8773 /lib
parent9f8c70f2592b022d0b2b5dd682e500ff60d2ba0c (diff)
parent6d33fa3b604e85be1b175df188dde1de0b6aef7c (diff)
downloadotp-cf9a0698142d03e5c32711926e81da4fba718b5a.tar.gz
otp-cf9a0698142d03e5c32711926e81da4fba718b5a.tar.bz2
otp-cf9a0698142d03e5c32711926e81da4fba718b5a.zip
Merge branch 'peppe/common_test/r16b03_docs_updated' into maint
* peppe/common_test/r16b03_docs_updated: Update event handling documentation OTP-11524
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/doc/src/event_handler_chapter.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common_test/doc/src/event_handler_chapter.xml b/lib/common_test/doc/src/event_handler_chapter.xml
index 3076d5f8ba..a231653558 100644
--- a/lib/common_test/doc/src/event_handler_chapter.xml
+++ b/lib/common_test/doc/src/event_handler_chapter.xml
@@ -193,7 +193,8 @@
<p><c>GroupName = unknown | atom()</c>, name of the group
(unknown if init- or end function times out).</p>
<p><c>GroupProperties = list()</c>, list of execution properties for the group.</p>
- <p><c>Result = ok | {skipped,SkipReason} | {failed,FailReason}</c>, the result.</p>
+ <p><c>Result = ok | {auto_skipped,SkipReason} | {skipped,SkipReason} | {failed,FailReason}</c>,
+ the result.</p>
<marker id="skipreason"/>
<p><c>SkipReason = {require_failed,RequireInfo} |
{require_failed_in_suite0,RequireInfo} |