Skip to content

Commit 90af3f4

Browse files
authored
[projmgr] Align telnet test case with debug adapter registry
1 parent 9a48e57 commit 90af3f4

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

tools/projmgr/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FetchContent_Declare(
1313
debug-adapter-registry
1414
DOWNLOAD_EXTRACT_TIMESTAMP ON
1515
URL https://github.com/Open-CMSIS-Pack/debug-adapter-registry/releases/download/v2.12.1/debug-adapter-registry.zip
16-
URL_HASH SHA256=cdba4704cbc8f0d8815508e733b9eb2180c87f749312a6b6938ad5dbe3ace3fa
16+
URL_HASH SHA256=13439ad3b30258da9bcfe2c6ce2f5afbb43a9025f73450854a63c4b443d6db98
1717
)
1818
FetchContent_MakeAvailable(debug-adapter-registry)
1919
file(COPY ${debug-adapter-registry_SOURCE_DIR}/schemas/debug-adapters.schema.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/schemas)

tools/projmgr/src/ProjMgrRunDebug.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ void ProjMgrRunDebug::CollectTelnetOptions(const ContextItem& context, DebugAdap
379379
usedPorts.insert(m_runDebug.debugger.telnet[pname].ullPort);
380380
}
381381
if (value.mode.empty()) {
382-
m_runDebug.debugger.telnet[pname].mode = adapter.defaults.telnet.mode.empty() ? "monitor" : adapter.defaults.telnet.mode;
382+
m_runDebug.debugger.telnet[pname].mode = adapter.defaults.telnet.mode.empty() ? "off" : adapter.defaults.telnet.mode;
383383
}
384384
if (value.mode == "file" && value.file.empty()) {
385385
m_runDebug.debugger.telnet[pname].file = fileBase + (pname.empty() ? "" : '.' + pname);
@@ -389,8 +389,8 @@ void ProjMgrRunDebug::CollectTelnetOptions(const ContextItem& context, DebugAdap
389389
if (adapter.defaults.telnet.active) {
390390
for (const auto& [pname, _] : pnames) {
391391
auto& telnet = m_runDebug.debugger.telnet[pname];
392-
if (telnet.mode.empty() || telnet.mode == "off") {
393-
telnet.mode = adapter.defaults.telnet.mode.empty() ? "monitor" : adapter.defaults.telnet.mode;
392+
if (telnet.mode.empty()) {
393+
telnet.mode = adapter.defaults.telnet.mode.empty() ? "off" : adapter.defaults.telnet.mode;
394394
}
395395
}
396396
}

tools/projmgr/test/src/ProjMgrUnitTests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6897,10 +6897,10 @@ R"(- mode: monitor
68976897
stringstream sstream3;
68986898
sstream3 << cbuildrun3["cbuild-run"]["debugger"]["telnet"];
68996899
EXPECT_EQ(
6900-
R"(- mode: monitor
6900+
R"(- mode: off
69016901
pname: cm0_core0
69026902
port: 4445
6903-
- mode: monitor
6903+
- mode: off
69046904
pname: cm0_core1
69056905
port: 4444)", sstream3.str());
69066906

0 commit comments

Comments
 (0)