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

AndroidTestRunner: replace fprintf() with Qt logging calls

Browse Source 
To make the code more uniform.

Pick-to: 6.7
Change-Id: I84cc9c6169e9eb5a4ba4909b6a7178206eb57c4d
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
Assam Boudjelthia 2023-12-12 15:51:42 +02:00
parent 4b0f774e3b
commit c0b0cdcb61
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,12 +156,12 @@ static bool execCommand(const QString &program, const QStringList &args,
const auto command = program + " "_L1 + args.join(u' '); const auto command = program + " "_L1 + args.join(u' ');
if (verbose && g_options.verbose) if (verbose && g_options.verbose)
fprintf(stdout, "Execute %s.\n", command.toUtf8().constData()); qDebug("Execute %s.\n", command.toUtf8().constData());
QProcess process; QProcess process;
process.start(program, args); process.start(program, args);
if (!process.waitForStarted()) { if (!process.waitForStarted()) {
fprintf(stderr, "Cannot execute command %s.\n", qPrintable(command)); qCritical("Cannot execute command %s.\n", qPrintable(command));
return false; return false;
} }
@ -169,7 +169,7 @@ static bool execCommand(const QString &program, const QStringList &args,
// QProcess::waitForFinished() 30 secs, so for that use a higher timeout. // QProcess::waitForFinished() 30 secs, so for that use a higher timeout.
const int FinishTimeout = program.endsWith("adb"_L1) ? 30000 : g_options.timeoutSecs * 1000; const int FinishTimeout = program.endsWith("adb"_L1) ? 30000 : g_options.timeoutSecs * 1000;
if (!process.waitForFinished(FinishTimeout)) { if (!process.waitForFinished(FinishTimeout)) {
fprintf(stderr, "Execution of command %s timed out.\n", qPrintable(command)); qCritical("Execution of command %s timed out.\n", qPrintable(command));
return false; return false;
} }
@ -178,7 +178,7 @@ static bool execCommand(const QString &program, const QStringList &args,
output->append(stdOut); output->append(stdOut);
if (verbose && g_options.verbose) if (verbose && g_options.verbose)
fprintf(stdout, "%s", stdOut.constData()); qDebug() << stdOut.constData();
return process.exitCode() == 0; return process.exitCode() == 0;
} }
@ -275,7 +275,7 @@ static bool parseOptions()
static void printHelp() static void printHelp()
{ {
fprintf(stderr, "Syntax: %s <options> -- [TESTARGS] \n" qWarning( "Syntax: %s <options> -- [TESTARGS] \n"
"\n" "\n"
" Creates an Android package in a temp directory <destination> and\n" " Creates an Android package in a temp directory <destination> and\n"
" runs it on the default emulator/device or on the one specified by\n" " runs it on the default emulator/device or on the one specified by\n"
@ -490,12 +490,10 @@ static void obtainSdkVersion()
execAdbCommand(versionArgs, &output, false); execAdbCommand(versionArgs, &output, false);
bool ok = false; bool ok = false;
int sdkVersion = output.toInt(&ok); int sdkVersion = output.toInt(&ok);
if (ok) { if (ok)
g_testInfo.sdkVersion = sdkVersion; g_testInfo.sdkVersion = sdkVersion;
} else { else
fprintf(stderr, "Unable to obtain the SDK version of the target.\n"); qCritical() << "Unable to obtain the SDK version of the target.\n";
fflush(stderr);
}
} }
static bool pullFiles() static bool pullFiles()
@ -534,8 +532,7 @@ static bool pullFiles()
auto checkerIt = g_options.checkFiles.find(outSuffix); auto checkerIt = g_options.checkFiles.find(outSuffix);
ret &= (checkerIt != g_options.checkFiles.end() && checkerIt.value()(output)); ret &= (checkerIt != g_options.checkFiles.end() && checkerIt.value()(output));
if (it.value() == "-"_L1) { if (it.value() == "-"_L1) {
fprintf(stdout, "%s", output.constData()); qDebug() << output.constData();
fflush(stdout);
} else { } else {
QFile out{it.value()}; QFile out{it.value()};
if (!out.open(QIODevice::WriteOnly)) if (!out.open(QIODevice::WriteOnly))
@ -718,9 +715,8 @@ int main(int argc, char *argv[])
} }
if (g_options.makeCommand.isEmpty()) { if (g_options.makeCommand.isEmpty()) {
fprintf(stderr, qCritical() << "It is required to provide a make command with the \"--make\" parameter "
"It is required to provide a make command with the \"--make\" parameter " "to generate the apk.\n";
"to generate the apk.\n");
return 1; return 1;
} }
if (!execCommand(g_options.makeCommand, nullptr, true)) { if (!execCommand(g_options.makeCommand, nullptr, true)) {
@ -737,9 +733,8 @@ int main(int argc, char *argv[])
} }
if (!QFile::exists(g_options.apkPath)) { if (!QFile::exists(g_options.apkPath)) {
fprintf(stderr, qCritical("No apk \"%s\" found after running the make command. "
"No apk \"%s\" found after running the make command. Check the provided path and " "Check the provided path and the make command.\n",
"the make command.\n",
qPrintable(g_options.apkPath)); qPrintable(g_options.apkPath));
return 1; return 1;
} }
@ -784,7 +779,6 @@ int main(int argc, char *argv[])
} }
success &= uninstallTestPackage(); success &= uninstallTestPackage();
fflush(stdout);
testRunnerLock.release(); testRunnerLock.release();