Просмотр исходного кода

Merge topic 'doc-ctest_test-output-control'

68e1385a5c Merge branch 'backport-3.24-doc-ctest_test-output-control' into doc-ctest_test-output-control
fadc93286a Help: Add crossrefs to ctest output control options
de892f3d4e Help: Add crossrefs to ctest output control options
3453e6bd48 Merge branch 'backport-3.24-doc-ctest_test-output-control' into doc-ctest_test-output-control
8981e88b18 Help: Add missing closing quote on C++ example

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7595
Craig Scott 3 лет назад
Родитель
Сommit
c615095cf7
1 измененных файлов с 6 добавлено и 2 удалено
  1. 6 2
      Help/command/ctest_test.rst

+ 6 - 2
Help/command/ctest_test.rst

@@ -175,7 +175,11 @@ The options are:
 
 See also the :variable:`CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE`,
 :variable:`CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE` and
-:variable:`CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION` variables.
+:variable:`CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION` variables, along with their
+corresponding :manual:`ctest(1)` command line options
+:option:`--test-output-size-passed <ctest --test-output-size-passed>`,
+:option:`--test-output-size-failed <ctest --test-output-size-failed>`, and
+:option:`--test-output-truncation <ctest --test-output-truncation>`.
 
 .. _`Additional Test Measurements`:
 
@@ -237,7 +241,7 @@ The following example demonstrates how to upload test images to CDash.
      "/dir/to/valid_img.gif</CTestMeasurementFile>" << std::endl;
 
    std::cout <<
-     "<CTestMeasurementFile type=\"image/png\" name=\"AlgoResult\"> <<
+     "<CTestMeasurementFile type=\"image/png\" name=\"AlgoResult\">" <<
      "/dir/to/img.png</CTestMeasurementFile>"
      << std::endl;