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

AndroidTestRunner: fix devie serial number handling

Browse Source 
The device serial number is being appended to the adb command which
is being treated as one single command and not as an argument, so pass
the serial number, if provided as an argument instead.

Pick-to: 6.8
Change-Id: I5c4a0945aca95e8d31f569b5cf99a85a37d22af2
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
Assam Boudjelthia 2024-10-08 01:18:09 +03:00
parent b3971d29c0
commit 2584abce70
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,6 +116,7 @@ struct Options
int timeoutSecs = 600; // 10 minutes
QString buildPath;
QString adbCommand{"adb"_L1};
QString serial;
QString makeCommand;
QString package;
QString activity;
@ -186,7 +187,13 @@ static bool execCommand(const QString &program, const QStringList &args,
static bool execAdbCommand(const QStringList &args, QByteArray *output = nullptr,
bool verbose = true)
{
return execCommand(g_options.adbCommand, args, output, verbose);
if (g_options.serial.isEmpty())
return execCommand(g_options.adbCommand, args, output, verbose);
QStringList argsWithSerial = {"-s"_L1, g_options.serial};
argsWithSerial.append(args);
return execCommand(g_options.adbCommand, argsWithSerial, output, verbose);
}
static bool execCommand(const QString &command, QByteArray *output = nullptr, bool verbose = true)
@ -259,9 +266,7 @@ static bool parseOptions()
if (g_options.helpRequested || g_options.buildPath.isEmpty() || g_options.apkPath.isEmpty())
return false;
QString serial = qEnvironmentVariable("ANDROID_DEVICE_SERIAL");
if (!serial.isEmpty())
g_options.adbCommand += " -s %1"_L1.arg(serial);
g_options.serial = qEnvironmentVariable("ANDROID_DEVICE_SERIAL");
if (g_options.ndkStackPath.isEmpty()) {
const QString ndkPath = qEnvironmentVariable("ANDROID_NDK_ROOT");
@ -610,7 +615,10 @@ void printLogcatCrashBuffer(const QString &formattedTime)
ndkStackProcess.start(g_options.ndkStackPath, { "-sym"_L1, libsPath });
}
const QStringList adbCrashArgs = { "logcat"_L1, "-b"_L1, "crash"_L1, "-t"_L1, formattedTime };
QStringList adbCrashArgs = { "logcat"_L1, "-b"_L1, "crash"_L1, "-t"_L1, formattedTime };
if (!g_options.serial.isEmpty())
adbCrashArgs = QStringList{"-s"_L1 + g_options.serial} + adbCrashArgs;
adbCrashProcess.start(g_options.adbCommand, adbCrashArgs);
if (!adbCrashProcess.waitForStarted()) {