aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-08-30 11:00:07 +0200
committerPeter Andersson <[email protected]>2012-08-30 11:00:07 +0200
commit5edc386f5e3a7082ca1ac4582e2b39da8820c429 (patch)
treeac19c63c4e3da6e592c48c91e39b221580b981bb /lib/test_server
parent9f69634d0ca0a21b0c8bc9ad1ab4d836db652170 (diff)
parent5c4751983c8aa9caded15316084c6b374632b293 (diff)
downloadotp-5edc386f5e3a7082ca1ac4582e2b39da8820c429.tar.gz
otp-5edc386f5e3a7082ca1ac4582e2b39da8820c429.tar.bz2
otp-5edc386f5e3a7082ca1ac4582e2b39da8820c429.zip
Merge remote branch 'upstream/maint'
Diffstat (limited to 'lib/test_server')
-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>