Explorar o código

Merge topic 'test-cmake-gui'

551937b4fb ci: Suppress hanging CMakeGUI test on macos-x86_64 jobs
2e5442eef5 Tests/CMakeGUI: Avoid QtTest internal timeout before ctest's timeout

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11421
Brad King hai 2 meses
pai
achega
1b099307e4
Modificáronse 2 ficheiros con 10 adicións e 0 borrados
  1. 7 0
      .gitlab/ci/ctest_exclusions.cmake
  2. 3 0
      Tests/CMakeGUI/CMakeGUITest.cmake

+ 7 - 0
.gitlab/ci/ctest_exclusions.cmake

@@ -48,6 +48,13 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "_xcode")
     )
 endif()
 
+if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "^macos_x86_64_")
+  list(APPEND test_exclusions
+    # FIXME(#27376): CMakeGUI's simpleConfigure:fail case hangs.
+    "^CMakeGUI$"
+    )
+endif()
+
 string(REPLACE ";" "|" test_exclusions "${test_exclusions}")
 if (test_exclusions)
   set(test_exclusions "(${test_exclusions})")

+ 3 - 0
Tests/CMakeGUI/CMakeGUITest.cmake

@@ -1,3 +1,6 @@
+# Avoid QtTest library timeouts before ctest's timeout.
+set(ENV{QTEST_FUNCTION_TIMEOUT} 3600000)
+
 function(run_cmake_gui_test name)
   if(DEFINED ENV{CMakeGUITest_TEST_FILTER} AND NOT name MATCHES "$ENV{CMakeGUITest_TEST_FILTER}")
     return()