From d913cd2ca09009ebae9b21e9e7e961457b0b92b6 Mon Sep 17 00:00:00 2001 From: Daniel Brondani Date: Fri, 12 Dec 2025 14:45:46 +0100 Subject: [PATCH] [projmgr] Align `telnet` test case with debug adapter registry (#1372) --- tools/projmgr/CMakeLists.txt | 2 +- tools/projmgr/src/ProjMgrRunDebug.cpp | 6 +++--- tools/projmgr/test/src/ProjMgrUnitTests.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/projmgr/CMakeLists.txt b/tools/projmgr/CMakeLists.txt index f786579ae..7d6d25675 100644 --- a/tools/projmgr/CMakeLists.txt +++ b/tools/projmgr/CMakeLists.txt @@ -13,7 +13,7 @@ FetchContent_Declare( debug-adapter-registry DOWNLOAD_EXTRACT_TIMESTAMP ON URL https://github.com/Open-CMSIS-Pack/debug-adapter-registry/releases/download/v2.12.1/debug-adapter-registry.zip - URL_HASH SHA256=cdba4704cbc8f0d8815508e733b9eb2180c87f749312a6b6938ad5dbe3ace3fa + URL_HASH SHA256=13439ad3b30258da9bcfe2c6ce2f5afbb43a9025f73450854a63c4b443d6db98 ) FetchContent_MakeAvailable(debug-adapter-registry) file(COPY ${debug-adapter-registry_SOURCE_DIR}/schemas/debug-adapters.schema.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/schemas) diff --git a/tools/projmgr/src/ProjMgrRunDebug.cpp b/tools/projmgr/src/ProjMgrRunDebug.cpp index e00b2615d..af2cdb2c8 100644 --- a/tools/projmgr/src/ProjMgrRunDebug.cpp +++ b/tools/projmgr/src/ProjMgrRunDebug.cpp @@ -379,7 +379,7 @@ void ProjMgrRunDebug::CollectTelnetOptions(const ContextItem& context, DebugAdap usedPorts.insert(m_runDebug.debugger.telnet[pname].ullPort); } if (value.mode.empty()) { - m_runDebug.debugger.telnet[pname].mode = adapter.defaults.telnet.mode.empty() ? "monitor" : adapter.defaults.telnet.mode; + m_runDebug.debugger.telnet[pname].mode = adapter.defaults.telnet.mode.empty() ? "off" : adapter.defaults.telnet.mode; } if (value.mode == "file" && value.file.empty()) { m_runDebug.debugger.telnet[pname].file = fileBase + (pname.empty() ? "" : '.' + pname); @@ -389,8 +389,8 @@ void ProjMgrRunDebug::CollectTelnetOptions(const ContextItem& context, DebugAdap if (adapter.defaults.telnet.active) { for (const auto& [pname, _] : pnames) { auto& telnet = m_runDebug.debugger.telnet[pname]; - if (telnet.mode.empty() || telnet.mode == "off") { - telnet.mode = adapter.defaults.telnet.mode.empty() ? "monitor" : adapter.defaults.telnet.mode; + if (telnet.mode.empty()) { + telnet.mode = adapter.defaults.telnet.mode.empty() ? "off" : adapter.defaults.telnet.mode; } } } diff --git a/tools/projmgr/test/src/ProjMgrUnitTests.cpp b/tools/projmgr/test/src/ProjMgrUnitTests.cpp index 69f51c5f4..16e25e55a 100644 --- a/tools/projmgr/test/src/ProjMgrUnitTests.cpp +++ b/tools/projmgr/test/src/ProjMgrUnitTests.cpp @@ -6897,10 +6897,10 @@ R"(- mode: monitor stringstream sstream3; sstream3 << cbuildrun3["cbuild-run"]["debugger"]["telnet"]; EXPECT_EQ( -R"(- mode: monitor +R"(- mode: off pname: cm0_core0 port: 4445 -- mode: monitor +- mode: off pname: cm0_core1 port: 4444)", sstream3.str());