From c6565611d650bfb51885e481317003e68c617eec Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 31 Mar 2023 12:09:36 +0200
Subject: [PATCH] RemoteLinux: Don't crash on empty test output

Amends 95609cdd57.

Change-Id: Id316ccf1989ac7853bdb71b22351aec7fd12fe7a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/remotelinux/linuxdevicetester.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index 0ee175ef85f..85bafe44eaf 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -13,6 +13,7 @@
 #include <utils/processinterface.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
+#include <utils/stringutils.h>
 
 using namespace ProjectExplorer;
 using namespace Utils;
@@ -98,9 +99,10 @@ TaskItem GenericLinuxDeviceTesterPrivate::echoTask() const
         process.setCommand({m_device->filePath("echo"), {s_echoContents}});
     };
     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)
-            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
             emit q->progressMessage(Tr::tr("Device replied to echo with expected contents.") + '\n');
     };