doc: Update documentation

diff --git a/cmake/macros/macro_deal_ii_add_test.cmake b/cmake/macros/macro_deal_ii_add_test.cmake
index 39d920fb21f4e7ab03662b3712b9137ce4987df6..281a696bbc6d3873b72c9b5c6acb2547accb219c 100644 (file)
--- a/cmake/macros/macro_deal_ii_add_test.cmake
+++ b/cmake/macros/macro_deal_ii_add_test.cmake
@@ -77,13 +77,16 @@
 #       test variant configures a larger number of MPI ranks (via
 #       .mpirun=N. in the output file) than this limit the test will be
 #       dropped. The special value 0 enforces no limit. Defaults to 0.
-
+#
 #   TEST_THREAD_LIMIT
 #     - Specifies the maximal number of worker threads that can should be
-#       used by the threading backend. Note that individual tests might
-#       exceed this limit by calling MultithreadInfo::set_thread_limit(), or
-#       by manually creating additional threads. The special value 0
-#       enforces no limit. Defaults to 0.
+#       used by the threading backend. If a test variant configures a
+#       larger number of threads (via .threads=N. in the output file) than
+#       this limit the test will be dropped. Note that individual tests
+#       might exceed this limit by calling
+#       MultithreadInfo::set_thread_limit(), or by manually creating
+#       additional threads. The special value 0 enforces no limit. Defaults
+#       to 0.
 #
 # Usage:
 #     DEAL_II_ADD_TEST(category test_name comparison_file)

diff --git a/cmake/macros/macro_deal_ii_pickup_tests.cmake b/cmake/macros/macro_deal_ii_pickup_tests.cmake
index 8651614cea9606c57e3bf46213747e2d65e3c7da..4401839a1cee253a3a866ddb1b99845b420f9b36 100644 (file)
--- a/cmake/macros/macro_deal_ii_pickup_tests.cmake
+++ b/cmake/macros/macro_deal_ii_pickup_tests.cmake
@@ -43,10 +43,13 @@
 #         dropped. The special value 0 enforces no limit. Defaults to 0.
 #     TEST_THREAD_LIMIT
 #       - Specifies the maximal number of worker threads that can should be
-#         used by the threading backend. Note that individual tests might
-#         exceed this limit by calling MultithreadInfo::set_thread_limit(),
-#         or by manually creating additional threads. The special value 0
-#         enforces no limit. Defaults to 0.
+#         used by the threading backend. If a test variant configures a
+#         larger number of threads (via .threads=N. in the output file)
+#         than this limit the test will be dropped. Note that individual
+#         tests might exceed this limit by calling
+#         MultithreadInfo::set_thread_limit(), or by manually creating
+#         additional threads. The special value 0 enforces no limit.
+#         Defaults to 0.
 #
 #     TEST_PICKUP_REGEX
 #       - A regular expression to select only a subset of tests during setup.

diff --git a/doc/developers/testsuite.html b/doc/developers/testsuite.html
index ae5fb39dacb8ce869b5883007cf24b6c6270d0c1..445b9d39561f7fab15d10fcac0ef641464b3088e 100644 (file)
--- a/doc/developers/testsuite.html
+++ b/doc/developers/testsuite.html
@@ -118,10 +118,12 @@ TEST_MPI_RANK_LIMIT
 
 TEST_THREAD_LIMIT
   - Specifies the maximal number of worker threads that can should be
-    used by the threading backend. Note that individual tests might
-    exceed this limit by calling MultithreadInfo::set_thread_limit(), or
-    by manually creating additional threads. The special value 0
-    enforces no limit. Defaults to 0.
+    used by the threading backend. If a test variant configures a larger
+    number of threads (via .threads=N. in the output file) than this limit
+    the test will be dropped. Note that individual tests might exceed this
+    limit by calling MultithreadInfo::set_thread_limit(), or by manually
+    creating additional threads. The special value 0 enforces no limit.
+    Defaults to 0.
 
 TEST_PICKUP_REGEX
   - A regular expression to select only a subset of tests during setup.
@@ -473,7 +475,7 @@ category/test.output
       just <code>category/test.output</code>. In pseudo code:
 <pre>
 category/test.[with_&lt;string&gt;(&lt;=|&gt;=|=|&lt;|&gt;)&lt;on|off|version&gt;.]*
-              [mpirun=&lt;x&gt;.][expect=&lt;y&gt;.][binary.][&lt;debug|release&gt;.]output
+              [mpirun=&lt;N|all&gt;.][threads=&lt;N|all&gt;.][expect=&lt;y&gt;.][binary.][&lt;debug|release&gt;.]output
 </pre>
       Normally, a test will be set up so that it runs twice, once in debug and
       once in release configuration.

diff --git a/doc/users/testsuite.html b/doc/users/testsuite.html
index dfbf6de5c033c4fa787e80a51e8618c3e0985c69..ccc40b6819c86864d6a62e4128569710bc6fcffb 100644 (file)
--- a/doc/users/testsuite.html
+++ b/doc/users/testsuite.html
@@ -323,10 +323,12 @@ TEST_MPI_RANK_LIMIT
 
 TEST_THREAD_LIMIT
   - Specifies the maximal number of worker threads that can should be
-    used by the threading backend. Note that individual tests might
-    exceed this limit by calling MultithreadInfo::set_thread_limit(), or
-    by manually creating additional threads. The special value 0
-    enforces no limit. Defaults to 0.</pre>
+    used by the threading backend. If a test variant configures a larger
+    number of threads (via .threads=N. in the output file) than this limit
+    the test will be dropped. Note that individual tests might exceed this
+    limit by calling MultithreadInfo::set_thread_limit(), or by manually
+    creating additional threads. The special value 0 enforces no limit.
+    Defaults to 0.</pre>
     <hr />
     <div class="right">
       <a href="http://validator.w3.org/check?uri=referer" target="_top">