From 167741717ffd7e82cd127b1671b990cd03a8096c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 25 Jun 2020 15:48:48 +0200 Subject: [PATCH] CMake: Fix tst_qmake not to hang and re-enable it We don't really know why, but using the ctest --force-new-ctest-process flag stops the test from hanging. Also re-enable the test. Task-number: QTBUG-78449 Task-number: QTBUG-81365 Change-Id: I33094696dfe3f610dc257089074b1c2a9926f651 Reviewed-by: Qt CI Bot Reviewed-by: Cristian Adam --- coin/instructions/cmake_regular_test_instructions.yaml | 2 +- tests/auto/tools/CMakeLists.txt | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/coin/instructions/cmake_regular_test_instructions.yaml b/coin/instructions/cmake_regular_test_instructions.yaml index f22196b2f92..4a44924056f 100644 --- a/coin/instructions/cmake_regular_test_instructions.yaml +++ b/coin/instructions/cmake_regular_test_instructions.yaml @@ -12,7 +12,7 @@ instructions: - type: ChangeDirectory directory: "{{.SourceDir}}_standalone_tests" - type: ExecuteCommand - command: "{{.Env.TESTS_ENV_PREFIX}} ctest -V --rerun-failed" + command: "{{.Env.TESTS_ENV_PREFIX}} ctest -V --rerun-failed --force-new-ctest-process" ignoreExitCode: true maxTimeInSeconds: 7200 maxTimeBetweenOutput: 900 diff --git a/tests/auto/tools/CMakeLists.txt b/tests/auto/tools/CMakeLists.txt index 048051663d0..b0895a1e70c 100644 --- a/tests/auto/tools/CMakeLists.txt +++ b/tests/auto/tools/CMakeLists.txt @@ -1,11 +1,7 @@ # Generated from tools.pro. add_subdirectory(qmakelib) -# special case begin -if(NOT WIN32) # @todo: this is broken, see QTBUG-78449 - add_subdirectory(qmake) -endif() -# special case end +add_subdirectory(qmake) #add_subdirectory(moc) add_subdirectory(rcc) if(TARGET Qt::Widgets)