From 03d7a4ac57ac52358fbf5388f1462a5347882d50 Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Mon, 18 Apr 2016 12:31:07 +0200
Subject: Skip pre/post test IO suite if cover or debug is running

OTP-13535

The return value of ct:get_timetrap_info/0 has been modified.
---
 lib/common_test/doc/src/ct.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'lib/common_test/doc/src/ct.xml')

diff --git a/lib/common_test/doc/src/ct.xml b/lib/common_test/doc/src/ct.xml
index a87be21d73..438099c074 100644
--- a/lib/common_test/doc/src/ct.xml
+++ b/lib/common_test/doc/src/ct.xml
@@ -601,18 +601,21 @@
     </func>
 
     <func>
-      <name>get_timetrap_info() -&gt; {Time, Scale}</name>
+      <name>get_timetrap_info() -&gt; {Time, {Scaling,ScaleVal}}</name>
       <fsummary>Reads information about the timetrap set for the current
         test case.</fsummary>
       <type>
         <v>Time = integer() | infinity</v>
-        <v>Scale = true | false</v>
+        <v>Scaling = true | false</v>
+        <v>ScaleVal = integer()</v>
       </type>
      <desc><marker id="get_timetrap_info-0"/>
         <p>Reads information about the timetrap set for the current test
-          case. <c>Scale</c> indicates if <c>Common Test</c> will attempt
+          case. <c>Scaling</c> indicates if <c>Common Test</c> will attempt
           to compensate timetraps automatically for runtime delays
-          introduced by, for example, tools like cover.</p>
+          introduced by, for example, tools like cover. <c>ScaleVal</c> is
+	  the value of the current scaling multipler (always 1 if scaling is
+	  disabled). Note the <c>Time</c> is not the scaled result.</p>
       </desc>
     </func>
 
-- 
cgit v1.2.3