diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-11-06 10:50:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-06 10:50:53 (GMT) |
| commit | 9201b3fa40a1cee598a90b3a0d90a40d27ddb49d (patch) | |
| tree | c69fe4c369c3602cf4b766ae3d0e3c01cebff7cc | |
| parent | 35594cd4346df779da3e14facee90561a37fe8be (diff) | |
| parent | e620bb7293282d11291ca7969ee3c867f12b2264 (diff) | |
| download | CMake-9201b3fa40a1cee598a90b3a0d90a40d27ddb49d.zip CMake-9201b3fa40a1cee598a90b3a0d90a40d27ddb49d.tar.gz CMake-9201b3fa40a1cee598a90b3a0d90a40d27ddb49d.tar.bz2 | |
Merge topic 'help_ctest_cuda_memcheck'
e620bb7293 Help: Add cuda-memcheck to CTest documentation
fb98883e2b CTest: Add cuda-memcheck to Dart and CTest module
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5469
| -rw-r--r-- | Help/manual/ctest.1.rst | 14 | ||||
| -rw-r--r-- | Help/variable/CTEST_MEMORYCHECK_TYPE.rst | 6 | ||||
| -rw-r--r-- | Modules/CTest.cmake | 2 | ||||
| -rw-r--r-- | Modules/DartConfiguration.tcl.in | 2 |
4 files changed, 20 insertions, 4 deletions
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index b5bb1c1..e947232 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -1142,6 +1142,20 @@ Additional configuration settings include: * `CTest Script`_ variable: none * :module:`CTest` module variable: ``DRMEMORY_COMMAND_OPTIONS`` +``CudaMemcheckCommand`` + Specify a ``MemoryCheckCommand`` that is known to be a command-line + compatible with cuda-memcheck or compute-sanitizer. + + * `CTest Script`_ variable: none + * :module:`CTest` module variable: ``CUDA_MEMCHECK_COMMAND`` + +``CudaMemcheckCommandOptions`` + Specify command-line options to the ``CudaMemcheckCommand`` tool. + They will be placed prior to the test command line. + + * `CTest Script`_ variable: none + * :module:`CTest` module variable: ``CUDA_MEMCHECK_COMMAND_OPTIONS`` + .. _`CTest Submit Step`: CTest Submit Step diff --git a/Help/variable/CTEST_MEMORYCHECK_TYPE.rst b/Help/variable/CTEST_MEMORYCHECK_TYPE.rst index 2452228..5204389 100644 --- a/Help/variable/CTEST_MEMORYCHECK_TYPE.rst +++ b/Help/variable/CTEST_MEMORYCHECK_TYPE.rst @@ -5,6 +5,6 @@ CTEST_MEMORYCHECK_TYPE Specify the CTest ``MemoryCheckType`` setting in a :manual:`ctest(1)` dashboard client script. -Valid values are ``Valgrind``, ``Purify``, ``BoundsChecker``, ``DrMemory`` and -``ThreadSanitizer``, ``AddressSanitizer``, ``LeakSanitizer``, ``MemorySanitizer``, and -``UndefinedBehaviorSanitizer``. +Valid values are ``Valgrind``, ``Purify``, ``BoundsChecker``, ``DrMemory``, +``CudaMemcheck``, ``ThreadSanitizer``, ``AddressSanitizer``, ``LeakSanitizer``, +``MemorySanitizer`` and ``UndefinedBehaviorSanitizer``. diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index ca9fcf5..8d04be3 100644 --- a/Modules/CTest.cmake +++ b/Modules/CTest.cmake @@ -174,7 +174,7 @@ if(BUILD_TESTING) "How many times to retry timed-out CTest submissions.") find_program(MEMORYCHECK_COMMAND - NAMES purify valgrind boundscheck drmemory + NAMES purify valgrind boundscheck drmemory cuda-memcheck compute-sanitizer PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Rational Software\\Purify\\Setup;InstallFolder]" DOC "Path to the memory checking command, used for memory error detection." diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in index 086ba07..d318c26 100644 --- a/Modules/DartConfiguration.tcl.in +++ b/Modules/DartConfiguration.tcl.in @@ -71,6 +71,8 @@ ValgrindCommand: @VALGRIND_COMMAND@ ValgrindCommandOptions: @VALGRIND_COMMAND_OPTIONS@ DrMemoryCommand: @DRMEMORY_COMMAND@ DrMemoryCommandOptions: @DRMEMORY_COMMAND_OPTIONS@ +CudaMemcheckCommand: @CUDA_MEMCHECK_COMMAND@ +CudaMemcheckCommandOptions: @CUDA_MEMCHECK_COMMAND_OPTIONS@ MemoryCheckType: @MEMORYCHECK_TYPE@ MemoryCheckSanitizerOptions: @MEMORYCHECK_SANITIZER_OPTIONS@ MemoryCheckCommand: @MEMORYCHECK_COMMAND@ |