summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-04-05 07:56:25 -0400
committerBrad King <brad.king@kitware.com>2023-04-05 12:06:13 -0400
commit1c8d4b4bf186356b82addbac56c14426a7833316 (patch)
tree89758c767155be83dbe0ec4990abb0452e439615
parent2c59598b9117f546e35f2cdb291c3052f75dfd3e (diff)
downloadcmake-1c8d4b4bf186356b82addbac56c14426a7833316.tar.gz
Tests: Teach RunCMake_TEST_FILTER to account for test variant description
-rw-r--r--Tests/RunCMake/RunCMake.cmake8
1 files changed, 6 insertions, 2 deletions
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index e1c923d621..8eb23a6a1d 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -11,8 +11,12 @@ foreach(
endforeach()
function(run_cmake test)
- if(DEFINED ENV{RunCMake_TEST_FILTER} AND NOT test MATCHES "$ENV{RunCMake_TEST_FILTER}")
- return()
+ if(DEFINED ENV{RunCMake_TEST_FILTER})
+ set(test_and_variant "${test}${RunCMake_TEST_VARIANT_DESCRIPTION}")
+ if(NOT test_and_variant MATCHES "$ENV{RunCMake_TEST_FILTER}")
+ return()
+ endif()
+ unset(test_and_variant)
endif()
set(top_src "${RunCMake_SOURCE_DIR}")