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 <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
parent
a2c772dc58
commit
167741717f
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user