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

Add --skip-install-root option to androidtestrunner

Browse Source 
Add the above option to android test runner since its not required
when building with Cmake.

Change-Id: Ie5c9b0af29cfa76802723960071b3bd2a37a56a5
Reviewed-by: Qt CMake Build Bot
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Leander Beernaert 2019-10-23 17:21:36 +02:00
parent f2cb720e3f
commit 340763d1ff
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@ struct Options
{ {
bool helpRequested = false; bool helpRequested = false;
bool verbose = false; bool verbose = false;
bool skipAddInstallRoot = false;
std::chrono::seconds timeout{300}; // 5minutes std::chrono::seconds timeout{300}; // 5minutes
QString androidDeployQtCommand; QString androidDeployQtCommand;
QString buildPath; QString buildPath;
@ -233,6 +234,8 @@ static bool parseOptions()
g_options.helpRequested = true; g_options.helpRequested = true;
else else
g_options.activity = arguments.at(++i); g_options.activity = arguments.at(++i);
} else if (argument.compare(QStringLiteral("--skip-install-root"), Qt::CaseInsensitive) == 0) {
g_options.skipAddInstallRoot = true;
} else if (argument.compare(QStringLiteral("--timeout"), Qt::CaseInsensitive) == 0) { } else if (argument.compare(QStringLiteral("--timeout"), Qt::CaseInsensitive) == 0) {
if (i + 1 == arguments.size()) if (i + 1 == arguments.size())
g_options.helpRequested = true; g_options.helpRequested = true;
@ -283,6 +286,7 @@ static void printHelp()
" If make is missing make sure the --path is set.\n" " If make is missing make sure the --path is set.\n"
" --apk <apk path>: If the apk is specified and if exists, we'll skip\n" " --apk <apk path>: If the apk is specified and if exists, we'll skip\n"
" the package building.\n" " the package building.\n"
" --skip-install-root: Do not append INSTALL_ROOT=... to the make command.\n"
" -- arguments that will be passed to the test application.\n" " -- arguments that will be passed to the test application.\n"
" --verbose: Prints out information during processing.\n" " --verbose: Prints out information during processing.\n"
" --help: Displays this information.\n\n", " --help: Displays this information.\n\n",
@ -452,10 +456,17 @@ int main(int argc, char *argv[])
} }
} else { } else {
if (!g_options.makeCommand.isEmpty()) { if (!g_options.makeCommand.isEmpty()) {
// we need to run make INSTALL_ROOT=path install to install the application file(s) first if (!g_options.skipAddInstallRoot) {
if (!execCommand(QStringLiteral("%1 INSTALL_ROOT=%2 install") // we need to run make INSTALL_ROOT=path install to install the application file(s) first
.arg(g_options.makeCommand, QDir::toNativeSeparators(g_options.buildPath)), nullptr, g_options.verbose)) { if (!execCommand(QStringLiteral("%1 INSTALL_ROOT=%2 install")
return 1; .arg(g_options.makeCommand, QDir::toNativeSeparators(g_options.buildPath)), nullptr, g_options.verbose)) {
return 1;
}
} else {
if (!execCommand(QStringLiteral("%1")
.arg(g_options.makeCommand), nullptr, g_options.verbose)) {
return 1;
}
} }
} }