Browse Source

Tests: Disable VSXaml test pending update to newer VS versions

It works only with the deprecated Visual Studio 12 2013 generator,
which is about to be removed.

Issue: #26248
Brad King 1 year ago
parent
commit
7c1b671c3a
2 changed files with 13 additions and 8 deletions
  1. 11 7
      Tests/CMakeLists.txt
  2. 2 1
      Tests/VSXaml/CMakeLists.txt

+ 11 - 7
Tests/CMakeLists.txt

@@ -2299,22 +2299,26 @@ if(BUILD_TESTING)
       list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/VSWinStorePhone/${name}")
     endmacro()
 
-    if(vs12 AND ws81)
-      add_test_VSWinStorePhone(vs12-store81-X86 "Visual Studio 12 2013" WindowsStore 8.1 Win32)
-      add_test_VSWinStorePhone(vs12-store81-ARM "Visual Studio 12 2013" WindowsStore 8.1 ARM)
-      add_test_VSWinStorePhone(vs12-store81-X64 "Visual Studio 12 2013" WindowsStore 8.1 x64)
-
+    # FIXME(#26248): Update this test to work with newer VS and Win 10.0.
+    # It previously ran with Visual Studio 12 2013 targeting Win 8.1.
+    if(FALSE AND CMAKE_GENERATOR MATCHES "Visual Studio")
       add_test(NAME VSXaml COMMAND ${CMAKE_CTEST_COMMAND}
         --build-and-test
           "${CMake_SOURCE_DIR}/Tests/VSXaml"
           "${CMake_BINARY_DIR}/Tests/VSXaml"
-          --build-generator "Visual Studio 12 2013"
+          --build-generator "${CMAKE_GENERATOR}"
           --build-project VSXaml
           --build-config $<CONFIGURATION>
           --build-options -DCMAKE_SYSTEM_NAME=WindowsStore
-                          -DCMAKE_SYSTEM_VERSION=8.1
+                          -DCMAKE_SYSTEM_VERSION=10.0
         )
     endif()
+
+    if(vs12 AND ws81)
+      add_test_VSWinStorePhone(vs12-store81-X86 "Visual Studio 12 2013" WindowsStore 8.1 Win32)
+      add_test_VSWinStorePhone(vs12-store81-ARM "Visual Studio 12 2013" WindowsStore 8.1 ARM)
+      add_test_VSWinStorePhone(vs12-store81-X64 "Visual Studio 12 2013" WindowsStore 8.1 x64)
+    endif()
     if(CMake_TEST_VSWinStorePhone_VS_2017 AND ws10_0)
       add_test_VSWinStorePhone(vs15-store10_0-X86 "Visual Studio 15 2017" WindowsStore 10.0 Win32)
       add_test_VSWinStorePhone(vs15-store10_0-ARM "Visual Studio 15 2017" WindowsStore 10.0 ARM)

+ 2 - 1
Tests/VSXaml/CMakeLists.txt

@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.2)
+# FIXME(#26248): This test is not executed anymore!
+cmake_minimum_required(VERSION 3.5)
 project(VSXaml)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)