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

AndroidTestRunner: don't use verbose for some adb commands

Browse Source 
Those two commands don't need to print info that is not necessarily
needed.

Pick-to: 6.8
Change-Id: I0a76c08848786ee9a9aa9e3cb876c66a79acaa3a
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
This commit is contained in:
Assam Boudjelthia 2024-10-26 15:13:27 +03:00
parent e70dae69a5
commit 31dfb55bdd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/androidtestrunner/main.cpp
View File

@ -422,7 +422,7 @@ static void waitForLoggingStarted()
QDeadlineTimer deadline(5000); QDeadlineTimer deadline(5000);
do { do {
if (execAdbCommand(adbLsCmd)) if (execAdbCommand(adbLsCmd, nullptr, false))
break; break;
QThread::msleep(100); QThread::msleep(100);
} while (!deadline.hasExpired() && !g_testInfo.isTestRunnerInterrupted.load()); } while (!deadline.hasExpired() && !g_testInfo.isTestRunnerInterrupted.load());
@ -694,7 +694,7 @@ static int testExitCode()
{ {
QByteArray exitCodeOutput; QByteArray exitCodeOutput;
const QString exitCodeCmd = "cat files/qtest_last_exit_code 2> /dev/null"_L1; 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; return EXIT_ERROR;
bool ok; bool ok;