diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-29 13:04:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-29 13:04:59 (GMT) |
| commit | 18153217e27d2cf560d874313557ec9fa2bcffdb (patch) | |
| tree | 5ac3c0c076a3c6be4f8fcd9607106bbfccaa9b73 /Help | |
| parent | a271286f417731916cd60c546665ec030bc5b2c7 (diff) | |
| parent | 13347740e2fe00ad51493c89087f1bbbc35b224c (diff) | |
| download | CMake-18153217e27d2cf560d874313557ec9fa2bcffdb.zip CMake-18153217e27d2cf560d874313557ec9fa2bcffdb.tar.gz CMake-18153217e27d2cf560d874313557ec9fa2bcffdb.tar.bz2 | |
Merge topic 'ctest_start_function_scope'
13347740 Help: add release notes, documentation for CTEST_RUN_CURRENT_SCRIPT behavior
74092d92 cmCTestScriptHandler: Add new field ShouldRunCurrentScript
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1703
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 | ||||
| -rw-r--r-- | Help/release/dev/ctest_start_function_scope.rst | 8 | ||||
| -rw-r--r-- | Help/variable/CTEST_RUN_CURRENT_SCRIPT.rst | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index c18d8da..3ac5123 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -513,6 +513,7 @@ Variables for CTest /variable/CTEST_P4_COMMAND /variable/CTEST_P4_OPTIONS /variable/CTEST_P4_UPDATE_OPTIONS + /variable/CTEST_RUN_CURRENT_SCRIPT /variable/CTEST_SCP_COMMAND /variable/CTEST_SITE /variable/CTEST_SOURCE_DIRECTORY diff --git a/Help/release/dev/ctest_start_function_scope.rst b/Help/release/dev/ctest_start_function_scope.rst new file mode 100644 index 0000000..f949c2b --- /dev/null +++ b/Help/release/dev/ctest_start_function_scope.rst @@ -0,0 +1,8 @@ +ctest_start_function_scope +-------------------------- + +* The :command:`ctest_start` command no longer sets + :variable:`CTEST_RUN_CURRENT_SCRIPT` due to issues with scoping if it is + called from inside a function. Instead, it sets an internal variable in + CTest. However, setting :variable:`CTEST_RUN_CURRENT_SCRIPT` to 0 at the + global scope still prevents the script from being re-run at the end. diff --git a/Help/variable/CTEST_RUN_CURRENT_SCRIPT.rst b/Help/variable/CTEST_RUN_CURRENT_SCRIPT.rst new file mode 100644 index 0000000..abc123c --- /dev/null +++ b/Help/variable/CTEST_RUN_CURRENT_SCRIPT.rst @@ -0,0 +1,5 @@ +CTEST_RUN_CURRENT_SCRIPT +------------------------ + +Setting this to 0 prevents :manual:`ctest(1)` from being run again when it +reaches the end of a script run by calling ``ctest -S``. |