From 7f44d8582b2b9463b2192487eee8c557e8400a11 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 30 Jun 2020 11:44:43 +0200
Subject: [PATCH] CMake build: Remove timeout for dumper tests

They take much longer, but are also optional.
Makes it possible to run via e.g. "ctest -V -R tst_debugger_dumpers"

Change-Id: I8bbda6ca36e25cd896b1f3be5d1696a27b8acc53
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
 cmake/QtCreatorAPI.cmake           | 9 +++++++--
 cmake/QtCreatorAPIInternal.cmake   | 8 +++++++-
 tests/auto/debugger/CMakeLists.txt | 1 +
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index 24264f9c600..8030f17d665 100644
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -641,7 +641,7 @@ function(extend_qtc_executable name)
 endfunction()
 
 function(add_qtc_test name)
-  cmake_parse_arguments(_arg "GTEST" "" "DEFINES;DEPENDS;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC" ${ARGN})
+  cmake_parse_arguments(_arg "GTEST" "TIMEOUT" "DEFINES;DEPENDS;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC" ${ARGN})
 
   foreach(dependency ${_arg_DEPENDS})
     if (NOT TARGET ${dependency} AND NOT _arg_GTEST)
@@ -684,7 +684,12 @@ function(add_qtc_test name)
 
   if (NOT _arg_GTEST)
     add_test(NAME ${name} COMMAND ${name})
-    finalize_test_setup(${name})
+    if (DEFINED _arg_TIMEOUT)
+      set(timeout_option TIMEOUT ${_arg_TIMEOUT})
+    else()
+      set(timeout_option)
+    endif()
+    finalize_test_setup(${name} ${timeout_option})
   endif()
 endfunction()
 
diff --git a/cmake/QtCreatorAPIInternal.cmake b/cmake/QtCreatorAPIInternal.cmake
index 2a743968d98..ea03aecdbfb 100644
--- a/cmake/QtCreatorAPIInternal.cmake
+++ b/cmake/QtCreatorAPIInternal.cmake
@@ -211,11 +211,17 @@ function(set_public_includes target includes)
 endfunction()
 
 function(finalize_test_setup test_name)
+  cmake_parse_arguments(_arg "" "TIMEOUT" "" ${ARGN})
+  if (DEFINED _arg_TIMEOUT)
+    set(timeout ${_arg_TIMEOUT})
+  else()
+    set(timeout 5)
+  endif()
   # Never translate tests:
   set_tests_properties(${name}
     PROPERTIES
       QT_SKIP_TRANSLATION ON
-      TIMEOUT 5
+      TIMEOUT ${timeout}
   )
 
   if (WIN32)
diff --git a/tests/auto/debugger/CMakeLists.txt b/tests/auto/debugger/CMakeLists.txt
index fb90869cde6..912877e0d97 100644
--- a/tests/auto/debugger/CMakeLists.txt
+++ b/tests/auto/debugger/CMakeLists.txt
@@ -9,6 +9,7 @@ add_qtc_test(tst_debugger_disassembler
 
 if (WITH_DEBUGGER_DUMPERS)
   add_qtc_test(tst_debugger_dumpers
+    TIMEOUT 0
     DEPENDS Qt5::Network Utils
     DEFINES DUMPERDIR="${PROJECT_SOURCE_DIR}/share/qtcreator/debugger"
     INCLUDES