aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/doc/src
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-08-30 10:57:20 +0200
committerPeter Andersson <[email protected]>2012-08-30 10:58:44 +0200
commit5c4751983c8aa9caded15316084c6b374632b293 (patch)
treeba5507286e4a76da00d68bd7d92590377c79242f /lib/test_server/doc/src
parent94f6c68ff4a46c69be0030aff553d6db92f29a35 (diff)
parent02e8dc98b5327712f4ae00ac9fcf5feb1d856ba0 (diff)
downloadotp-5c4751983c8aa9caded15316084c6b374632b293.tar.gz
otp-5c4751983c8aa9caded15316084c6b374632b293.tar.bz2
otp-5c4751983c8aa9caded15316084c6b374632b293.zip
Merge remote branch 'origin/peppe/common_test/documentation_r15b02.2' into maint
* origin/peppe/common_test/documentation_r15b02.2: Update the documentation for R15B02 OTP-10050 OTP-10069 OTP-10072 OTP-10087 OTP-9865 OTP-10049 OTP-10089 OTP-10145 OTP-9896 OTP-10135 OTP-10067 OTP-9625 OTP-10127 OTP-10172 OTP-10248 OTP-9625 OTP-10086 OTP-10248
Diffstat (limited to 'lib/test_server/doc/src')
-rw-r--r--lib/test_server/doc/src/test_server_ctrl.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/test_server/doc/src/test_server_ctrl.xml b/lib/test_server/doc/src/test_server_ctrl.xml
index 9028a67ecb..6b33591701 100644
--- a/lib/test_server/doc/src/test_server_ctrl.xml
+++ b/lib/test_server/doc/src/test_server_ctrl.xml
@@ -769,11 +769,13 @@ Optional, if not given the test server controller node
constantly updated. The following can be reported:
</p>
<p><c>What = tests_start, Data = {Name,NumCases}</c><br></br>
+ <c>What = loginfo, Data = [{topdir,TestRootDir},{rundir,CurrLogDir}]</c><br></br>
<c>What = tests_done, Data = {Ok,Failed,{UserSkipped,AutoSkipped}}</c><br></br>
- <c>What = tc_start, Data = {Mod,Func}</c><br></br>
+ <c>What = tc_start, Data = {{Mod,Func},TCLogFile}</c><br></br>
<c>What = tc_done, Data = {Mod,Func,Result}</c><br></br>
<c>What = tc_user_skip, Data = {Mod,Func,Comment}</c><br></br>
- <c>What = tc_auto_skip, Data = {Mod,Func,Comment}</c></p>
+ <c>What = tc_auto_skip, Data = {Mod,Func,Comment}</c><br></br>
+ <c>What = framework_error, Data = {{FWMod,FWFunc},Error}</c></p>
</desc>
</func>
<func>