From 8f1df9aaa87f1d899babce42a8fdbb28c13ae604 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 8 Jul 2023 16:18:19 +0200 Subject: [PATCH] QProcess on QNX: only expect failure if there is one The QProcessunixProcessParameters sometimes fails in CI with an XPASS. Unclear under what conditions QNX behaves correctly, so accept that it is unpredictable and only expect a failure when a failure is imminent. Amends f9c87cfd44bcf4b90cb45354252ef19f647b0469. Change-Id: Icf70861343747e6323c7953a2462b7bbc46549b3 Reviewed-by: Thiago Macieira --- tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index 71239910dc6..b4012c69c3b 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -1787,10 +1787,12 @@ void tst_QProcess::unixProcessParameters() QVERIFY2(process.waitForStarted(5000), qPrintable(process.errorString())); QVERIFY(process.waitForFinished(5000)); + const QString stdErr = process.readAllStandardError(); #ifdef Q_OS_QNX - QEXPECT_FAIL("ignore-sigpipe", "QTBUG-114720: flag is taking no effect", Abort); + if (stdErr != QString()) + QEXPECT_FAIL("ignore-sigpipe", "QTBUG-114720: flag is sometimes ignored", Abort); #endif - QCOMPARE(process.readAllStandardError(), QString()); + QCOMPARE(stdErr, QString()); QCOMPARE(process.readAll(), QString()); QCOMPARE(process.exitCode(), 0); QCOMPARE(process.exitStatus(), QProcess::NormalExit);