diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-14 18:00:47 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2020-09-17 00:11:06 +0000 |
| commit | 2ed99ff5ca338ac02f71c347b1449d4662e6c221 (patch) | |
| tree | 6d169ec3fd9ef72a64541136fdcec117e1bea678 /src/corelib/configure.json | |
| parent | 0aa4b33b92da6a95d29caee62e4ac5e4c53a84ff (diff) | |
Make usage of forkfd_pidfd in QProcess a configurable feature
Our CI cross-compiling arm qemu builds have issues in tests that use
QProcess, due to user-space qemu seemingly not supporting pidfds
properly.
Add a 'forkfd_pidfd' configure.json feature, which can be manually
disabled when configuring Qt, causing QProcess to do a regular fork
instead of using the new pidfd kernel feature.
This will help us avoid the regression of multiple tests failing on
the new Ubuntu 20.04 CI host images when they are run via qemu.
Task-number: QTBUG-86285
Task-number: QTBUG-86187
Task-number: QTBUG-86198
Change-Id: Ib2209d7e95126e0fb738bf59e39070d5a62c482f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/configure.json')
| -rw-r--r-- | src/corelib/configure.json | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 8e2d4e859d..27fff51a0f 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -1013,6 +1013,11 @@ "condition": "config.win32", "output": [ "privateFeature" ] }, + "forkfd_pidfd": { + "label": "CLONE_PIDFD support in forkfd", + "condition": "config.linux", + "output": [ "privateFeature" ] + }, "win32_system_libs": { "label": "Windows System Libraries", "condition": "config.win32 && libs.advapi32 && libs.gdi32 && libs.kernel32 && libs.netapi32 && libs.ole32 && libs.shell32 && libs.uuid && libs.user32 && libs.winmm && libs.ws2_32" @@ -1094,7 +1099,12 @@ Note that this is required for plugin loading. Qt GUI needs QPA plugins for basi "condition": "config.qnx" }, "pcre2", - "system-pcre2" + "system-pcre2", + { + "type": "feature", + "args": "forkfd_pidfd", + "condition": "config.linux" + } ] } ] |