1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Fix tst_qmake not to hang and re-enable it

Browse Source 
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Alexandru Croitor 2020-06-25 15:48:48 +02:00
parent a2c772dc58
commit 167741717f
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coin/instructions/cmake_regular_test_instructions.yaml
View File

@ -12,7 +12,7 @@ instructions:
- type: ChangeDirectory - type: ChangeDirectory
directory: "{{.SourceDir}}_standalone_tests" directory: "{{.SourceDir}}_standalone_tests"
- type: ExecuteCommand - 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 ignoreExitCode: true
maxTimeInSeconds: 7200 maxTimeInSeconds: 7200
maxTimeBetweenOutput: 900 maxTimeBetweenOutput: 900

6
tests/auto/tools/CMakeLists.txt
View File

@ -1,11 +1,7 @@
# Generated from tools.pro. # Generated from tools.pro.
add_subdirectory(qmakelib) add_subdirectory(qmakelib)
# special case begin add_subdirectory(qmake)
if(NOT WIN32) # @todo: this is broken, see QTBUG-78449
add_subdirectory(qmake)
endif()
# special case end
#add_subdirectory(moc) #add_subdirectory(moc)
add_subdirectory(rcc) add_subdirectory(rcc)
if(TARGET Qt::Widgets) if(TARGET Qt::Widgets)