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

RemoteLinux: Don't crash on empty test output

Browse Source 
Amends 95609cdd57.

Change-Id: Id316ccf1989ac7853bdb71b22351aec7fd12fe7a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-03-31 12:09:36 +02:00
parent 82a4ea721f
commit c6565611d6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/remotelinux/linuxdevicetester.cpp
View File

@@ -13,6 +13,7 @@
#include <utils/processinterface.h> #include <utils/processinterface.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/stringutils.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
@@ -98,9 +99,10 @@ TaskItem GenericLinuxDeviceTesterPrivate::echoTask() const
process.setCommand({m_device->filePath("echo"), {s_echoContents}}); process.setCommand({m_device->filePath("echo"), {s_echoContents}});
}; };
const auto done = [this](const QtcProcess &process) { const auto done = [this](const QtcProcess &process) {
const QString reply = process.cleanedStdOut().chopped(1); // Remove trailing '\n' const QString reply = Utils::chopIfEndsWith(process.cleanedStdOut(), '\n');
if (reply != s_echoContents) if (reply != s_echoContents)
emit q->errorMessage(Tr::tr("Device replied to echo with unexpected contents.") + '\n'); emit q->errorMessage(Tr::tr("Device replied to echo with unexpected contents: \"%1\"")
.arg(reply) + '\n');
else else
emit q->progressMessage(Tr::tr("Device replied to echo with expected contents.") + '\n'); emit q->progressMessage(Tr::tr("Device replied to echo with expected contents.") + '\n');
}; };