From a53dfaf623c3167ae07e8360e7cf9599e2904f24 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 5 Oct 2023 16:45:07 +0200 Subject: [PATCH] Process: Switch the default implementation into QProcess Task-number: QTCREATORBUG-28811 Change-Id: I5647b760998a80f59583b478a65de6d615e1ca55 Reviewed-by: hjk --- src/libs/utils/process.cpp | 3 ++- tests/auto/utils/process/tst_process.cpp | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libs/utils/process.cpp b/src/libs/utils/process.cpp index da7d65de0c5..192b3bc880c 100644 --- a/src/libs/utils/process.cpp +++ b/src/libs/utils/process.cpp @@ -631,7 +631,8 @@ private: static ProcessImpl defaultProcessImpl() { - if (qtcEnvironmentVariableIsSet("QTC_USE_QPROCESS")) + const QString value = qtcEnvironmentVariable("QTC_USE_QPROCESS", "TRUE").toUpper(); + if (value != "FALSE" && value != "0") return ProcessImpl::QProcess; return ProcessImpl::ProcessLauncher; } diff --git a/tests/auto/utils/process/tst_process.cpp b/tests/auto/utils/process/tst_process.cpp index 4bea9979584..0e46f7c0940 100644 --- a/tests/auto/utils/process/tst_process.cpp +++ b/tests/auto/utils/process/tst_process.cpp @@ -1322,8 +1322,6 @@ void tst_Process::crashAfterOneSecond() QVERIFY(process.waitForStarted(1000)); QElapsedTimer timer; timer.start(); - // Please note that QProcess documentation says it should return false, but apparently - // it doesn't (try running this test with QTC_USE_QPROCESS=) QVERIFY(process.waitForFinished(30000)); QVERIFY(timer.elapsed() < 30000); QCOMPARE(process.state(), QProcess::NotRunning);