Skip to content

Commit

Permalink
[devtools] Omit leading Cvendor delimiter :: in API identifier
Browse files Browse the repository at this point in the history
  • Loading branch information
@spcaipers-arm
spcaipers-arm authored Nov 29, 2024
1 parent d0c0775 commit 936cf7d
Show file tree
Hide file tree
Showing 48 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion libs/rtemodel/src/RteItem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ string RteItem::GetPartialComponentID(bool bWithBundle) const {

string RteItem::GetApiID(bool withVersion) const
{
string id = RteConstants::SUFFIX_CVENDOR;
string id;
id += GetCclassName();
id += RteConstants::PREFIX_CGROUP;
id += GetCgroupName();
Expand Down
4 changes: 2 additions & 2 deletions libs/rtemodel/test/src/RteItemTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ TEST(RteItemTest, GetComponentID_all_attributes) {
RteItem item(attributes);
item.SetTag("require");

EXPECT_EQ("::Class:Group(API)@1.1.1", item.GetApiID(true));
EXPECT_EQ("::Class:Group(API)", item.GetApiID(false));
EXPECT_EQ("Class:Group(API)@1.1.1", item.GetApiID(true));
EXPECT_EQ("Class:Group(API)", item.GetApiID(false));

EXPECT_EQ("Vendor::Class&Bundle:Group:Sub&[email protected]", item.GetComponentID(true));
EXPECT_EQ("Vendor::Class&Bundle:Group:Sub&Variant", item.GetComponentID(false));
Expand Down
6 changes: 3 additions & 3 deletions libs/rtemodel/test/src/RteModelTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,10 @@ TEST(RteModelTest, LoadPacks) {
EXPECT_FALSE(c != nullptr);

// get API
const string& apiId = "::RteTest:CORE(API)";
const string& apiId = "RteTest:CORE(API)";
RteApi* api = rteModel->GetLatestApi(apiId);
ASSERT_TRUE(api);
EXPECT_EQ(api->GetID(), "::RteTest:CORE(API)@1.1.2");
EXPECT_EQ(api->GetID(), "RteTest:CORE(API)@1.1.2");
EXPECT_EQ(api->GetPackageID(), "ARM::[email protected]");

// make pack "dominant"
Expand All @@ -257,7 +257,7 @@ TEST(RteModelTest, LoadPacks) {
pack->Construct(); // refresh internal state
api = rteModel->GetLatestApi(apiId);
ASSERT_TRUE(api);
EXPECT_EQ(api->GetID(), "::RteTest:CORE(API)@1.1.1");
EXPECT_EQ(api->GetID(), "RteTest:CORE(API)@1.1.1");
EXPECT_EQ(api->GetPackageID(), "ARM::[email protected]");
}

Expand Down
2 changes: 1 addition & 1 deletion test/projects/RteTestM3/license_info_ref.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ licenses:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)

- license: BSD-3-Clause
packs:
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestAccessSequences/ref/pack-access-sequences+CM4-Board.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,5 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,5 +119,5 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,5 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion ...s/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,5 +145,5 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,5 +113,5 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,5 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion ...gr/test/data/TestSolution/ComponentSources/ref/components.Debug+RteTest_ARMCM3.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:TemplateFile(API)
- component: RteTest:TemplateFile(API)
- license: <unknown>
license-agreement: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/license.txt
packs:
Expand Down
2 changes: 1 addition & 1 deletion ...est/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion ...rojmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion ...jmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion ...projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion ...rojmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure-only.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion ...rojmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion ...test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Board:Test:[email protected]
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion ...test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Board:Test:[email protected]
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion .../projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion ...rojmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion ...gr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:TemplateFile(API)
- component: RteTest:TemplateFile(API)
- license: <unknown>
license-agreement: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/license.txt
packs:
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion .../projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,6 @@ build-gen:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ build:
packs:
- pack: ARM::[email protected]
components:
- component: ::RteTest:CORE(API)
- component: ARM::Device:Startup&RteTest [email protected]
- component: ARM::RteTest:[email protected]
- component: RteTest:CORE(API)
- license: BSD-3-Clause
packs:
- pack: ARM::[email protected]
Expand Down
Loading

0 comments on commit 936cf7d

Please sign in to comment.