Skip to content

[projmgr] Align telnet test case with debug adapter registry (#1372) #2303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brondani merged 1 commit into from
Dec 12, 2025
Merged

[projmgr] Align telnet test case with debug adapter registry (#1372) #2303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/projmgr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions tools/projmgr/src/ProjMgrRunDebug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/test/src/ProjMgrUnitTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
Loading