Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl

Change-Id: Ie9df84af22570d601db002e391a1a0d97e7cd9e1

4 files changed, 46 insertions, 5 deletions

diff --git a/src/testlib/doc/src/qt-webpages.qdoc b/src/testlib/doc/src/qt-webpages.qdoc
index 976435e668..aa907f3685 100644
--- a/src/testlib/doc/src/qt-webpages.qdoc
+++ b/src/testlib/doc/src/qt-webpages.qdoc
@@ -30,8 +30,8 @@
 */
 
 /*!
-    \externalpage https://www.froglogic.com/coco/
-    \title Froglogic Coco Code Coverage
+    \externalpage https://www.qt.io/product/quality-assurance/coco
+    \title Coco
 */
 
 /*!
diff --git a/src/testlib/doc/src/qttest-best-practices.qdoc b/src/testlib/doc/src/qttest-best-practices.qdoc
index 7143e644fd..da03399668 100644
--- a/src/testlib/doc/src/qttest-best-practices.qdoc
+++ b/src/testlib/doc/src/qttest-best-practices.qdoc
@@ -184,7 +184,7 @@
 
     \section2 Use Coverage Tools
 
-    Use a coverage tool such as \l {Froglogic Coco Code Coverage} or \l {gcov}
+    Use a coverage tool such as \l {Coco} or \l {gcov}
     to help write tests that cover as many statements, branches, and conditions
     as possible in the function or class being tested. The earlier this is done
     in the development cycle for a new feature, the easier it will be to catch
diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc
index 84781a6773..cae17c347b 100644
--- a/src/testlib/doc/src/qttestlib-manual.qdoc
+++ b/src/testlib/doc/src/qttestlib-manual.qdoc
@@ -134,6 +134,47 @@
 
     For more examples, refer to the \l{Qt Test Tutorial}.
 
+    \section1 Increasing Test Function Timeout
+
+    QtTest limits the run-time of each test to catch infinite loops and similar
+    bugs. By default, any test function call will be interrupted after five
+    minutes. For data-driven tests, this applies to each call with a distinct
+    data-tag. This timeout can be configured by setting the \c QTEST_FUNCTION_TIMEOUT
+    environment variable to the maximum number of milliseconds that is acceptable
+    for a single call to take. If a test takes longer than the configured timeout,
+    it is interrupted, and \c qFatal() is called. As a result, the test aborts by
+    default, as if it had crashed.
+
+    To set \c QTEST_FUNCTION_TIMEOUT from the command line on Linux or macOS, enter:
+
+    \badcode
+    QTEST_FUNCTION_TIMEOUT=900000
+    export QTEST_FUNCTION_TIMEOUT
+    \endcode
+
+    On Windows:
+    \badcode
+    SET QTEST_FUNCTION_TIMEOUT=900000
+    \endcode
+
+    Then run the test inside this environment.
+
+    Alternatively, you can set the environment variable programmatically in the
+    test code itself, for example by calling, from the
+    \l{Creating a Test}{initMain()} special method of your test class:
+
+    \badcode
+    qputenv("QTEST_FUNCTION_TIMEOUT", "900000");
+    \endcode
+
+    To calculate a suitable value for the timeout, see how long the test usually
+    takes and decide how much longer it can take without that being a symptom of
+    some problem. Convert that longer time to milliseconds to get the timeout value.
+    For example, if you decide that a test that takes several minutes could
+    reasonably take up to twenty minutes, for example on a slow machine,
+    multiply \c{20 * 60 * 1000 = 1200000} and set the environment variable to
+    \c 1200000 instead of the \c 900000 above.
+
     \if !defined(qtforpython)
     \section1 Building a Test
 
diff --git a/src/testlib/selfcover.pri b/src/testlib/selfcover.pri
index 7de50ba6e6..eb9d5ac53c 100644
--- a/src/testlib/selfcover.pri
+++ b/src/testlib/selfcover.pri
@@ -1,5 +1,5 @@
 # Configuration for testlib and its tests, to instrument with
-# FrogLogic's Squish CoCo (cf. testcocoon.prf, which handles similar
+# Coco (cf. testcocoon.prf, which handles similar
 # for general code; but testlib needs special handling).
 
 # Only for use when feature testlib_selfcover is enabled:
@@ -13,7 +13,7 @@ COVERAGE_OPTIONS += --cs-include-file-abs-wildcard=*/src/testlib/*
 COVERAGE_OPTIONS += --cs-mcc # enable Multiple Condition Coverage
 COVERAGE_OPTIONS += --cs-mcdc # enable Multiple Condition / Decision Coverage
 # (recommended for ISO 26262 ASIL A, B and C -- highly recommended for ASIL D)
-# https://doc.froglogic.com/squish-coco/4.1/codecoverage.html#sec%3Amcdc
+# https://doc.qt.io/coco/code-coverage-analysis.html#mc-dc
 
 QMAKE_CFLAGS += $$COVERAGE_OPTIONS
 QMAKE_CXXFLAGS += $$COVERAGE_OPTIONS