Browse Source

Tests: Teach RunCMake_TEST_FILTER to account for test variant description

Brad King 2 years ago
parent
commit
1c8d4b4bf1
1 changed files with 6 additions and 2 deletions
  1. 6 2
      Tests/RunCMake/RunCMake.cmake

+ 6 - 2
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}")