diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-04 13:30:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-04 13:30:40 (GMT) |
| commit | bb4d70c1650ce4300631c535df4914bda35cd66c (patch) | |
| tree | d89f8600b908735733a6ec3ebc2b47cc8bc04785 /Modules | |
| parent | a6ffbc21705bd02503ad7097c9ba7cefb6312c9f (diff) | |
| parent | dff56b0b978d68ef0923f00cd2e41db239ba32a7 (diff) | |
| download | CMake-bb4d70c1650ce4300631c535df4914bda35cd66c.zip CMake-bb4d70c1650ce4300631c535df4914bda35cd66c.tar.gz CMake-bb4d70c1650ce4300631c535df4914bda35cd66c.tar.bz2 | |
Merge topic 'GoogleTest-disabled-underscore'
dff56b0b97 GoogleTest: Match the full 'DISABLED_' prefix to disable tests
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matthew Woehlke <matthew.woehlke@kitware.com>
Merge-request: !5567
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GoogleTestAddTests.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/GoogleTestAddTests.cmake b/Modules/GoogleTestAddTests.cmake index 883e1f4..0f79c9a 100644 --- a/Modules/GoogleTestAddTests.cmake +++ b/Modules/GoogleTestAddTests.cmake @@ -136,7 +136,7 @@ function(gtest_discover_tests_impl) ${TEST_XML_OUTPUT_PARAM} ${extra_args} ) - if(suite MATCHES "^DISABLED" OR test MATCHES "^DISABLED") + if(suite MATCHES "^DISABLED_" OR test MATCHES "^DISABLED_") add_command(set_tests_properties "${testname}" PROPERTIES DISABLED TRUE |