feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

iOS: Provide more information when things go wrong with the Simulator

Browse Source 
Error messages tend to be posted on stderr, so read all output in
addition to stdout-only, and provide that for error message.

Change-Id: I5f7f38ba1db13ab37cb7a752b4b73c9a9779a57c
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Eike Ziller
2021-01-29 17:28:46 +01:00
parent 3a294f670d
commit 495889cb8f
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/ios/simulatorcontrol.cpp
View File

@@ -79,20 +79,22 @@ static bool checkForTimeout(const chrono::high_resolution_clock::time_point &sta
return timedOut; return timedOut;
} }
static bool runCommand(const CommandLine &command, QString *output) static bool runCommand(const CommandLine &command, QString *stdOutput, QString *allOutput = nullptr)
{ {
SynchronousProcess p; SynchronousProcess p;
p.setTimeoutS(-1); p.setTimeoutS(-1);
SynchronousProcessResponse resp = p.runBlocking(command); SynchronousProcessResponse resp = p.runBlocking(command);
if (output) if (stdOutput)
*output = resp.stdOut(); *stdOutput = resp.stdOut();
if (allOutput)
*allOutput = resp.allOutput();
return resp.result == SynchronousProcessResponse::Finished; return resp.result == SynchronousProcessResponse::Finished;
} }
static bool runSimCtlCommand(QStringList args, QString *output) static bool runSimCtlCommand(QStringList args, QString *output, QString *allOutput = nullptr)
{ {
args.prepend("simctl"); args.prepend("simctl");
return runCommand({"xcrun", args}, output); return runCommand({"xcrun", args}, output, allOutput);
} }
static bool launchSimulator(const QString &simUdid) { static bool launchSimulator(const QString &simUdid) {
@@ -484,6 +486,7 @@ void SimulatorControlPrivate::installApp(QFutureInterface<SimulatorControl::Resp
SimulatorControl::ResponseData response(simUdid); SimulatorControl::ResponseData response(simUdid);
response.success = runSimCtlCommand({"install", simUdid, bundlePath.toString()}, response.success = runSimCtlCommand({"install", simUdid, bundlePath.toString()},
nullptr,
&response.commandOutput); &response.commandOutput);
if (!fi.isCanceled()) if (!fi.isCanceled())
fi.reportResult(response); fi.reportResult(response);
@@ -513,8 +516,9 @@ void SimulatorControlPrivate::launchApp(QFutureInterface<SimulatorControl::Respo
args << extraArgument; args << extraArgument;
} }
if (runSimCtlCommand(args, &response.commandOutput)) { QString stdOutput;
const QString pIdStr = response.commandOutput.trimmed().split(' ').last().trimmed(); if (runSimCtlCommand(args, &stdOutput, &response.commandOutput)) {
const QString pIdStr = stdOutput.trimmed().split(' ').last().trimmed();
bool validPid = false; bool validPid = false;
response.pID = pIdStr.toLongLong(&validPid); response.pID = pIdStr.toLongLong(&validPid);
response.success = validPid; response.success = validPid;
@@ -530,7 +534,7 @@ void SimulatorControlPrivate::deleteSimulator(QFutureInterface<SimulatorControl:
const QString &simUdid) const QString &simUdid)
{ {
SimulatorControl::ResponseData response(simUdid); SimulatorControl::ResponseData response(simUdid);
response.success = runSimCtlCommand({"delete", simUdid}, &response.commandOutput); response.success = runSimCtlCommand({"delete", simUdid}, nullptr, &response.commandOutput);
if (!fi.isCanceled()) if (!fi.isCanceled())
fi.reportResult(response); fi.reportResult(response);
@@ -540,7 +544,7 @@ void SimulatorControlPrivate::resetSimulator(QFutureInterface<SimulatorControl::
const QString &simUdid) const QString &simUdid)
{ {
SimulatorControl::ResponseData response(simUdid); SimulatorControl::ResponseData response(simUdid);
response.success = runSimCtlCommand({"erase", simUdid}, &response.commandOutput); response.success = runSimCtlCommand({"erase", simUdid}, nullptr, &response.commandOutput);
if (!fi.isCanceled()) if (!fi.isCanceled())
fi.reportResult(response); fi.reportResult(response);
@@ -551,6 +555,7 @@ void SimulatorControlPrivate::renameSimulator(QFutureInterface<SimulatorControl:
{ {
SimulatorControl::ResponseData response(simUdid); SimulatorControl::ResponseData response(simUdid);
response.success = runSimCtlCommand({"rename", simUdid, newName}, response.success = runSimCtlCommand({"rename", simUdid, newName},
nullptr,
&response.commandOutput); &response.commandOutput);
if (!fi.isCanceled()) if (!fi.isCanceled())
@@ -564,12 +569,12 @@ void SimulatorControlPrivate::createSimulator(QFutureInterface<SimulatorControl:
{ {
SimulatorControl::ResponseData response("Invalid"); SimulatorControl::ResponseData response("Invalid");
if (!name.isEmpty()) { if (!name.isEmpty()) {
response.success = runSimCtlCommand({"create", name, QString stdOutput;
deviceType.identifier, response.success
runtime.identifier}, = runSimCtlCommand({"create", name, deviceType.identifier, runtime.identifier},
&response.commandOutput); &stdOutput,
response.simUdid = response.success ? response.commandOutput.trimmed() &response.commandOutput);
: QString(); response.simUdid = response.success ? stdOutput.trimmed() : QString();
} }
if (!fi.isCanceled()) if (!fi.isCanceled())
@@ -581,6 +586,7 @@ void SimulatorControlPrivate::takeSceenshot(QFutureInterface<SimulatorControl::R
{ {
SimulatorControl::ResponseData response(simUdid); SimulatorControl::ResponseData response(simUdid);
response.success = runSimCtlCommand({"io", simUdid, "screenshot", filePath}, response.success = runSimCtlCommand({"io", simUdid, "screenshot", filePath},
nullptr,
&response.commandOutput); &response.commandOutput);
if (!fi.isCanceled()) if (!fi.isCanceled())
fi.reportResult(response); fi.reportResult(response);