Merge topic 'test-vs16-v90'

71a4f052ed Tests: Avoid running VS 16+ tests when using a pre-v140 toolset

Acked-by: Kitware Robot <[email protected]>
Merge-request: !9515

Tests/RunCMake/CMakeLists.txt

@@ -748,7 +748,8 @@ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
   endif()
 endif()
 
-if(CMAKE_GENERATOR MATCHES "^Visual Studio (1[6-9]|[2-9][0-9])")
+if(CMAKE_GENERATOR MATCHES "^Visual Studio (1[6-9]|[2-9][0-9])"
+    AND NOT CMAKE_GENERATOR_TOOLSET MATCHES "^(v80|v90|v100|v110|v120)$")
   add_RunCMake_test(VsDotnetSdk)
   add_RunCMake_test(VsNugetPackageRestore)
 endif()

Tests/RunCMake/include_external_msproject/RunCMakeTest.cmake

@@ -11,7 +11,8 @@ if(RunCMake_GENERATOR MATCHES "Visual Studio")
   run_cmake(VSCSharpReference)
 endif()
 
-if(RunCMake_GENERATOR MATCHES "^Visual Studio (1[6-9]|[2-9][0-9])")
+if(RunCMake_GENERATOR MATCHES "^Visual Studio (1[6-9]|[2-9][0-9])"
+    AND NOT RunCMake_GENERATOR_TOOLSET MATCHES "^(v80|v90|v100|v110|v120)$")
   function(run_VSCSharpOnlyProject)
     set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/VSCSharpOnlyProject-build)
     run_cmake(VSCSharpOnlyProject)