diff options
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/ctest_build.rst | 5 | ||||
| -rw-r--r-- | Help/command/ctest_configure.rst | 7 | ||||
| -rw-r--r-- | Help/command/ctest_coverage.rst | 5 | ||||
| -rw-r--r-- | Help/command/ctest_test.rst | 5 | ||||
| -rw-r--r-- | Help/command/ctest_upload.rst | 6 | ||||
| -rw-r--r-- | Help/release/dev/ctest-capture-error.rst | 8 |
6 files changed, 34 insertions, 2 deletions
diff --git a/Help/command/ctest_build.rst b/Help/command/ctest_build.rst index e1b7793..d3ceb2d 100644 --- a/Help/command/ctest_build.rst +++ b/Help/command/ctest_build.rst @@ -13,6 +13,7 @@ Perform the :ref:`CTest Build Step` as a :ref:`Dashboard Client`. [NUMBER_ERRORS <num-err-var>] [NUMBER_WARNINGS <num-warn-var>] [RETURN_VALUE <result-var>] + [CAPTURE_CMAKE_ERROR <result-var>] ) Build the project and store results in ``Build.xml`` @@ -66,6 +67,10 @@ The options are: ``RETURN_VALUE <result-var>`` Store the return value of the native build tool in the given variable. +``CAPTURE_CMAKE_ERROR <result-var>`` + Store in the ``<result-var>`` variable -1 if there are any errors running + the command and prevent ctest from returning non-zero if an error occurs. + ``QUIET`` Suppress any CTest-specific non-error output that would have been printed to the console otherwise. The summary of warnings / errors, diff --git a/Help/command/ctest_configure.rst b/Help/command/ctest_configure.rst index 851c292..b11e77c 100644 --- a/Help/command/ctest_configure.rst +++ b/Help/command/ctest_configure.rst @@ -6,7 +6,8 @@ Perform the :ref:`CTest Configure Step` as a :ref:`Dashboard Client`. :: ctest_configure([BUILD <build-dir>] [SOURCE <source-dir>] [APPEND] - [OPTIONS <options>] [RETURN_VALUE <result-var>] [QUIET]) + [OPTIONS <options>] [RETURN_VALUE <result-var>] [QUIET] + [CAPTURE_CMAKE_ERROR <result-var>]) Configure the project build tree and record results in ``Configure.xml`` for submission with the :command:`ctest_submit` command. @@ -33,6 +34,10 @@ The options are: Store in the ``<result-var>`` variable the return value of the native configuration tool. +``CAPTURE_CMAKE_ERROR <result-var>`` + Store in the ``<result-var>`` variable -1 if there are any errors running + the command and prevent ctest from returning non-zero if an error occurs. + ``QUIET`` Suppress any CTest-specific non-error messages that would have otherwise been printed to the console. Output from the underlying diff --git a/Help/command/ctest_coverage.rst b/Help/command/ctest_coverage.rst index 12429b9..ec1ee25 100644 --- a/Help/command/ctest_coverage.rst +++ b/Help/command/ctest_coverage.rst @@ -8,6 +8,7 @@ Perform the :ref:`CTest Coverage Step` as a :ref:`Dashboard Client`. ctest_coverage([BUILD <build-dir>] [APPEND] [LABELS <label>...] [RETURN_VALUE <result-var>] + [CAPTURE_CMAKE_ERROR <result-var] [QUIET] ) @@ -33,6 +34,10 @@ The options are: Store in the ``<result-var>`` variable ``0`` if coverage tools ran without error and non-zero otherwise. +``CAPTURE_CMAKE_ERROR <result-var>`` + Store in the ``<result-var>`` variable -1 if there are any errors running + the command and prevent ctest from returning non-zero if an error occurs. + ``QUIET`` Suppress any CTest-specific non-error output that would have been printed to the console otherwise. The summary indicating how many diff --git a/Help/command/ctest_test.rst b/Help/command/ctest_test.rst index 412e323..551bc58 100644 --- a/Help/command/ctest_test.rst +++ b/Help/command/ctest_test.rst @@ -18,6 +18,7 @@ Perform the :ref:`CTest Test Step` as a :ref:`Dashboard Client`. [SCHEDULE_RANDOM <ON|OFF>] [STOP_TIME <time-of-day>] [RETURN_VALUE <result-var>] + [CAPTURE_CMAKE_ERROR <result-var>] [QUIET] ) @@ -80,6 +81,10 @@ The options are: Store in the ``<result-var>`` variable ``0`` if all tests passed. Store non-zero if anything went wrong. +``CAPTURE_CMAKE_ERROR <result-var>`` + Store in the ``<result-var>`` variable -1 if there are any errors running + the command and prevent ctest from returning non-zero if an error occurs. + ``QUIET`` Suppress any CTest-specific non-error messages that would have otherwise been printed to the console. Output from the underlying test command is not diff --git a/Help/command/ctest_upload.rst b/Help/command/ctest_upload.rst index d9630d2..39d9de1 100644 --- a/Help/command/ctest_upload.rst +++ b/Help/command/ctest_upload.rst @@ -5,7 +5,7 @@ Upload files to a dashboard server as a :ref:`Dashboard Client`. :: - ctest_upload(FILES <file>... [QUIET]) + ctest_upload(FILES <file>... [QUIET] [CAPTURE_CMAKE_ERROR <result-var>]) The options are: @@ -16,3 +16,7 @@ The options are: ``QUIET`` Suppress any CTest-specific non-error output that would have been printed to the console otherwise. + +``CAPTURE_CMAKE_ERROR <result-var>`` + Store in the ``<result-var>`` variable -1 if there are any errors running + the command and prevent ctest from returning non-zero if an error occurs. diff --git a/Help/release/dev/ctest-capture-error.rst b/Help/release/dev/ctest-capture-error.rst new file mode 100644 index 0000000..5a286c7 --- /dev/null +++ b/Help/release/dev/ctest-capture-error.rst @@ -0,0 +1,8 @@ +ctest-capture-error +------------------- + +* The :command:`ctest_configure`, :command:`ctest_build`, + :command:`ctest_test`, :command:`ctest_coverage`, and :command:`ctest_upload` + commands gained a new ``CAPTURE_CMAKE_ERROR`` option to capture any errors + that occur as the commands run into a variable and avoid affecting the return + code of the :manual:`ctest(1)` process. |