Skip to content

[projmgr] Fix pname for SCVD entries in cbuild-run (#1416) #2364

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
Feb 11, 2026
Merged

[projmgr] Fix pname for SCVD entries in cbuild-run (#1416) #2364

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 test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@
</files>
</component>

<component Cclass="RteTest" Cgroup="scvd" Cversion="1.1.1" condition="ARMCM3 RteTest">
<component Cclass="RteTest" Cgroup="scvd" Cversion="1.1.1" condition="DeviceDependent">
<description>scvd test</description>
<files>
<file category="other" name="Components/RteTest.scvd"/>
Expand Down
25 changes: 17 additions & 8 deletions tools/projmgr/src/ProjMgrRunDebug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2024-2025 Arm Limited. All rights reserved.
* Copyright (c) 2024-2026 Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down Expand Up @@ -211,17 +211,26 @@ bool ProjMgrRunDebug::CollectSettings(const vector<ContextItem*>& contexts, cons
m_runDebug.systemDescriptions.push_back(item);
}
}
StrVec scvdFiles;
// scvd
StrVecMap scvdFiles;
for (const auto& context : contexts) {
for (const auto& [scvdFile, _] : context->rteActiveTarget->GetScvdFiles()) {
CollectionUtils::PushBackUniquely(scvdFiles, scvdFile);
CollectionUtils::PushBackUniquely(scvdFiles[scvdFile], context->deviceItem.pname);
}
}
for (const auto& scvdFile : scvdFiles) {
FilesType item;
item.file = scvdFile;
item.type = "scvd";
m_runDebug.systemDescriptions.push_back(item);
for (const auto& [scvdFile, pnameVec] : scvdFiles) {
const bool allPnames = pnameVec.size() == pnames.size();
// when one file is valid for multiple cores, but not for all cores -> multiple entries with a different pname each
for (const auto& pname : pnameVec) {
FilesType item;
item.file = scvdFile;
item.type = "scvd";
item.pname = allPnames ? "" : pname;
m_runDebug.systemDescriptions.push_back(item);
if (allPnames) {
break;
}
}
}

// outputs
Expand Down
3 changes: 3 additions & 0 deletions tools/projmgr/test/data/TestRunDebug/core0.cproject.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
project:

device: :cm0_core0

components:
- component: RteTest:scvd
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW2.cbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ build:
category: doc
version: 0.1.1
- component: ARM::RteTest:scvd@1.1.1
condition: ARMCM3 RteTest
condition: DeviceDependent
from-pack: ARM::RteTest_DFP@0.2.0
selected-by: RteTest:scvd
files:
Expand Down
3 changes: 3 additions & 0 deletions tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW3.cbuild-run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ cbuild-run:
system-descriptions:
- file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/SVD/ARMCM0.svd
type: svd
- file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Components/RteTest.scvd
type: scvd
pname: cm0_core0
debugger:
name: CMSIS-DAP@pyOCD
protocol: swd
Expand Down
Loading