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

macOS: Ignore stderr in tst_QProcess::terminateInChildProcessModifier

Browse Source 
As we produce crash reporting via Swift on macOS 15 now.

Pick-to: 6.8 6.9
Change-Id: Iab4777b29bcaa66eff9d2f1de63072f5744d56df
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2025-01-15 11:48:52 +01:00
parent 5c783083f5
commit dbfc3c9c38
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
View File

@ -16,6 +16,7 @@
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QMetaType> #include <QtCore/QMetaType>
#include <QtCore/QScopeGuard> #include <QtCore/QScopeGuard>
#include <QtCore/qoperatingsystemversion.h>
#include <QtNetwork/QHostInfo> #include <QtNetwork/QHostInfo>
#include <qplatformdefs.h> #include <qplatformdefs.h>
@ -1680,13 +1681,22 @@ void tst_QProcess::terminateInChildProcessModifier()
QCOMPARE(process.readAllStandardOutput(), QByteArray()); QCOMPARE(process.readAllStandardOutput(), QByteArray());
// some environments print extra stuff to stderr when we crash // some environments print extra stuff to stderr when we crash
#ifndef Q_OS_QNX
if (!QTestPrivate::isRunningArmOnX86()) { #if defined(Q_OS_QNX)
QByteArray standardError = process.readAllStandardError(); return;
QVERIFY2(standardError.isEmpty() == stderrIsEmpty, #elif defined(Q_OS_MACOS)
"stderr was: " + standardError); if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSequoia) {
if (qEnvironmentVariableIsSet("SWIFT_BACKTRACE"))
return; // Swift's crash reporting is printed to stderr
} }
#else
if (QTestPrivate::isRunningArmOnX86())
return;
#endif #endif
QByteArray standardError = process.readAllStandardError();
QVERIFY2(standardError.isEmpty() == stderrIsEmpty,
"stderr was: " + standardError);
} }
void tst_QProcess::raiseInChildProcessModifier() void tst_QProcess::raiseInChildProcessModifier()