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

AndroidTestRunner: allow using adb's ANDROID_SERIAL env var

Browse Source 
androidtestrunner should've used ANDROID_SERIAL adb env var, instead
of introuducing the new one ANDROID_DEVICE_SERIAL, but for now
support both.

Change-Id: Id0fc75fc64d7d3dd033c60e6ba9c6c3350ddd899
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 252550877dff358b02a5be773d32fe606bff51f4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia 2024-10-21 00:28:32 +03:00 committed by Qt Cherry-pick Bot
parent b71b416e54
commit df743c2164
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,7 +266,9 @@ static bool parseOptions()
if (g_options.helpRequested || g_options.buildPath.isEmpty() || g_options.apkPath.isEmpty()) if (g_options.helpRequested || g_options.buildPath.isEmpty() || g_options.apkPath.isEmpty())
return false; return false;
g_options.serial = qEnvironmentVariable("ANDROID_DEVICE_SERIAL"); g_options.serial = qEnvironmentVariable("ANDROID_SERIAL");
if (g_options.serial.isEmpty())
g_options.serial = qEnvironmentVariable("ANDROID_DEVICE_SERIAL");
if (g_options.ndkStackPath.isEmpty()) { if (g_options.ndkStackPath.isEmpty()) {
const QString ndkPath = qEnvironmentVariable("ANDROID_NDK_ROOT"); const QString ndkPath = qEnvironmentVariable("ANDROID_NDK_ROOT");
@ -282,8 +284,8 @@ static void printHelp()
{ {
qWarning( "Syntax: %s <options> -- [TESTARGS] \n" qWarning( "Syntax: %s <options> -- [TESTARGS] \n"
"\n" "\n"
" Runs an Android test on the default emulator/device or on the one\n" " Runs a Qt for Android test on an emulator or a device. Specify a device\n"
" specified by \"ANDROID_DEVICE_SERIAL\" environment variable.\n" " using the environment variables ANDROID_SERIAL or ANDROID_DEVICE_SERIAL.\n"
"\n" "\n"
" Mandatory arguments:\n" " Mandatory arguments:\n"
" --path <path>: The path where androiddeployqt builds the android package.\n" " --path <path>: The path where androiddeployqt builds the android package.\n"