diff options
| -rw-r--r-- | coin/instructions/cmake_regular_test_instructions.yaml | 2 | ||||
| -rw-r--r-- | 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 f22196b2f9..4a44924056 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 048051663d..b0895a1e70 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) |