aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-12-04 20:24:49 +0100
committerPeter Andersson <[email protected]>2013-12-04 20:24:49 +0100
commitb642236a5b387c2150bab7e6ba4133655eca8e11 (patch)
tree663b7c3511eeede8384e023df921ac0e9aed1c65 /lib
parent573426e3fa7788060a228e08e0b7db7defc3aec5 (diff)
parentcf9a0698142d03e5c32711926e81da4fba718b5a (diff)
downloadotp-b642236a5b387c2150bab7e6ba4133655eca8e11.tar.gz
otp-b642236a5b387c2150bab7e6ba4133655eca8e11.tar.bz2
otp-b642236a5b387c2150bab7e6ba4133655eca8e11.zip
Merge branch 'maint'
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 f7bd35ce58..47d0ba59fb 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} |