diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2019-12-05 10:32:35 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2019-12-09 10:23:16 +0000 |
| commit | 79bbe93c1bba433e30afd31b4974634a6bbbdf39 (patch) | |
| tree | 5ef185332def2b39659213551f9f790d394477ce | |
| parent | 9eed77fe86ed91b08d4f9dc23d3534eeb3dfff6a (diff) | |
| download | qt-creator-79bbe93c1bba433e30afd31b4974634a6bbbdf39.tar.gz | |
Android: Make more logged command calls copy&pasteable
Change-Id: I43e01efc4cb583235ad2d97150d4478b23558659
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/android/androidrunnerworker.cpp | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 14b5ef2050..d883496e6c 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -768,7 +768,7 @@ QProcess *AndroidManager::runAdbCommandDetached(const QStringList &args, QString { std::unique_ptr<QProcess> p(new QProcess); const QString adb = AndroidConfigurations::currentConfig().adbToolPath().toString(); - qCDebug(androidManagerLog) << "Running command:" << adb << args.join(' '); + qCDebug(androidManagerLog) << "Running command (async):" << CommandLine(adb, args).toUserOutput(); p->start(adb, args); if (p->waitForStarted(500) && p->state() == QProcess::Running) { if (deleteOnFinish) { @@ -779,7 +779,9 @@ QProcess *AndroidManager::runAdbCommandDetached(const QStringList &args, QString } QString errorStr = QString::fromUtf8(p->readAllStandardError()); - qCDebug(androidManagerLog) << "Running command failed" << adb << args.join(' ') << errorStr; + qCDebug(androidManagerLog) << "Running command (async) failed:" + << CommandLine(adb, args).toUserOutput() + << "Output:" << errorStr; if (err) *err = errorStr; return nullptr; @@ -791,12 +793,12 @@ SdkToolResult AndroidManager::runCommand(const CommandLine &command, Android::SdkToolResult cmdResult; Utils::SynchronousProcess cmdProc; cmdProc.setTimeoutS(timeoutS); - qCDebug(androidManagerLog) << "Running command: " << command.toUserOutput(); + qCDebug(androidManagerLog) << "Running command (sync):" << command.toUserOutput(); SynchronousProcessResponse response = cmdProc.run(command, writeData); cmdResult.m_stdOut = response.stdOut().trimmed(); cmdResult.m_stdErr = response.stdErr().trimmed(); cmdResult.m_success = response.result == Utils::SynchronousProcessResponse::Finished; - qCDebug(androidManagerLog) << "Running command finshed:" << command.toUserOutput() + qCDebug(androidManagerLog) << "Running command (sync) finshed:" << command.toUserOutput() << "Success:" << cmdResult.m_success << "Output:" << response.allRawOutput(); if (!cmdResult.success()) diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index a789f7c012..5b9806e5bc 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -599,7 +599,7 @@ void AndroidRunnerWorker::handleJdbWaiting() QStringList jdbArgs("-connect"); jdbArgs << QString("com.sun.jdi.SocketAttach:hostname=localhost,port=%1") .arg(m_localJdbServerPort.toString()); - qCDebug(androidRunWorkerLog) << "Starting JDB:" << jdbPath << jdbArgs.join(' '); + qCDebug(androidRunWorkerLog) << "Starting JDB:" << CommandLine(jdbPath, jdbArgs).toUserOutput(); std::unique_ptr<QProcess, Deleter> jdbProcess(new QProcess, &deleter); jdbProcess->setProcessChannelMode(QProcess::MergedChannels); jdbProcess->start(jdbPath.toString(), jdbArgs); |