From 7decb3af6a71ec7c55270ee96d6941efb1428a6a Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Sat, 26 Oct 2024 15:13:27 +0300 Subject: [PATCH] AndroidTestRunner: don't use verbose for some adb commands Those two commands don't need to print info that is not necessarily needed. Change-Id: I0a76c08848786ee9a9aa9e3cb876c66a79acaa3a Reviewed-by: Ville Voutilainen (cherry picked from commit 31dfb55bdda9fd248dcb3f956e18454e9fbebfa6) Reviewed-by: Qt Cherry-pick Bot --- src/tools/androidtestrunner/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/androidtestrunner/main.cpp b/src/tools/androidtestrunner/main.cpp index ad5f3ba0b09..e5a5b0acc28 100644 --- a/src/tools/androidtestrunner/main.cpp +++ b/src/tools/androidtestrunner/main.cpp @@ -422,7 +422,7 @@ static void waitForLoggingStarted() QDeadlineTimer deadline(5000); do { - if (execAdbCommand(adbLsCmd)) + if (execAdbCommand(adbLsCmd, nullptr, false)) break; QThread::msleep(100); } while (!deadline.hasExpired() && !g_testInfo.isTestRunnerInterrupted.load()); @@ -694,7 +694,7 @@ static int testExitCode() { QByteArray exitCodeOutput; const QString exitCodeCmd = "cat files/qtest_last_exit_code 2> /dev/null"_L1; - if (!execAdbCommand({ "shell"_L1, runCommandAsUserArgs(exitCodeCmd) }, &exitCodeOutput)) + if (!execAdbCommand({ "shell"_L1, runCommandAsUserArgs(exitCodeCmd) }, &exitCodeOutput, false)) return EXIT_ERROR; bool ok;