From 936cf7dde90a26a8a9a751f2b542b709c0eb34b8 Mon Sep 17 00:00:00 2001 From: Samuel Pelegrinello Caipers <71756456+spcaipers-arm@users.noreply.github.com> Date: Fri, 29 Nov 2024 15:03:02 +0000 Subject: [PATCH] [devtools] Omit leading Cvendor delimiter `::` in API identifier --- libs/rtemodel/src/RteItem.cpp | 2 +- libs/rtemodel/test/src/RteItemTest.cpp | 4 ++-- libs/rtemodel/test/src/RteModelTest.cpp | 6 +++--- test/projects/RteTestM3/license_info_ref.txt | 2 +- .../ref/pack-access-sequences+CM4-Board.cbuild.yml | 2 +- .../ref/empty/project.Debug+TEST_TARGET.cbuild.yml | 2 +- .../ref/empty/project.Release+TEST_TARGET.cbuild.yml | 2 +- .../ref/multiple-components.Debug+CM0.cbuild.yml | 2 +- .../TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml | 2 +- .../ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml | 2 +- .../ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml | 2 +- .../data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml | 2 +- .../ref/components.Debug+RteTest_ARMCM3.cbuild.yml | 2 +- .../ref/branch-protection.Debug+bti-signret.cbuild.yml | 2 +- .../ref/branch-protection.Debug+bti.cbuild.yml | 2 +- .../ref/branch-protection.Debug+no-bp.cbuild.yml | 2 +- .../DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml | 2 +- .../DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml | 2 +- .../DeviceAttributes/ref/endian.Debug+big.cbuild.yml | 2 +- .../DeviceAttributes/ref/endian.Debug+little.cbuild.yml | 2 +- .../DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml | 2 +- .../DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml | 2 +- .../DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml | 2 +- .../DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml | 2 +- .../DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml | 2 +- .../DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml | 2 +- .../ref/trustzone.Debug+non-secure.cbuild.yml | 2 +- .../ref/trustzone.Debug+secure-only.cbuild.yml | 2 +- .../DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml | 2 +- .../ref/trustzone.Debug+tz-disabled.cbuild.yml | 2 +- .../DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml | 2 +- .../ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml | 2 +- .../ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml | 2 +- .../ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml | 2 +- .../ref/library.Debug+RteTest_ARMCM3.cbuild.yml | 2 +- .../ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml | 2 +- .../TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml | 2 +- .../test_board_and_device+TEST_TARGET.cbuild.yml | 2 +- .../ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml | 2 +- .../TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild.yml | 2 +- .../data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml | 2 +- .../TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml | 2 +- .../data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml | 2 +- .../data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml | 2 +- .../TestSolution/ref/outputFiles.Debug+Target.cbuild.yml | 2 +- .../TestSolution/ref/outputFiles.Library+Target.cbuild.yml | 2 +- .../test/data/TestSolution/ref/pre-include+CM0.cbuild.yml | 2 +- tools/projmgr/test/src/ProjMgrUnitTests.cpp | 2 +- 48 files changed, 51 insertions(+), 51 deletions(-) diff --git a/libs/rtemodel/src/RteItem.cpp b/libs/rtemodel/src/RteItem.cpp index 10a5bc829..bf6801528 100644 --- a/libs/rtemodel/src/RteItem.cpp +++ b/libs/rtemodel/src/RteItem.cpp @@ -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(); diff --git a/libs/rtemodel/test/src/RteItemTest.cpp b/libs/rtemodel/test/src/RteItemTest.cpp index 8452e930e..2acf74d4d 100644 --- a/libs/rtemodel/test/src/RteItemTest.cpp +++ b/libs/rtemodel/test/src/RteItemTest.cpp @@ -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&Variant@9.9.9", item.GetComponentID(true)); EXPECT_EQ("Vendor::Class&Bundle:Group:Sub&Variant", item.GetComponentID(false)); diff --git a/libs/rtemodel/test/src/RteModelTest.cpp b/libs/rtemodel/test/src/RteModelTest.cpp index 915338c20..75136fa9b 100644 --- a/libs/rtemodel/test/src/RteModelTest.cpp +++ b/libs/rtemodel/test/src/RteModelTest.cpp @@ -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::RteTest_DFP@0.2.0"); // make pack "dominant" @@ -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::RteTest_DFP@0.1.1"); } diff --git a/test/projects/RteTestM3/license_info_ref.txt b/test/projects/RteTestM3/license_info_ref.txt index 84f932594..4cbc16d38 100644 --- a/test/projects/RteTestM3/license_info_ref.txt +++ b/test/projects/RteTestM3/license_info_ref.txt @@ -11,9 +11,9 @@ licenses: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) - license: BSD-3-Clause packs: diff --git a/tools/projmgr/test/data/TestAccessSequences/ref/pack-access-sequences+CM4-Board.cbuild.yml b/tools/projmgr/test/data/TestAccessSequences/ref/pack-access-sequences+CM4-Board.cbuild.yml index d15554f1c..763f165e6 100644 --- a/tools/projmgr/test/data/TestAccessSequences/ref/pack-access-sequences+CM4-Board.cbuild.yml +++ b/tools/projmgr/test/data/TestAccessSequences/ref/pack-access-sequences+CM4-Board.cbuild.yml @@ -71,5 +71,5 @@ build: packs: - pack: ARM::RteTest_DFP@0.1.1 components: - - component: ::RteTest:CORE(API) - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml b/tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml index 26a4fa35c..a1613b7f2 100644 --- a/tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml +++ b/tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml @@ -68,5 +68,5 @@ build: packs: - pack: ARM::RteTest_DFP@0.1.1 components: - - component: ::RteTest:CORE(API) - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml b/tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml index e341bc15c..b7c97382f 100644 --- a/tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml +++ b/tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml @@ -68,5 +68,5 @@ build: packs: - pack: ARM::RteTest_DFP@0.1.1 components: - - component: ::RteTest:CORE(API) - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml index 607bc1106..8717cd138 100644 --- a/tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml @@ -119,5 +119,5 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml index 0e7d46a26..80a6054e2 100644 --- a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml @@ -107,5 +107,5 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml index c17edb420..a0fb4b0e5 100644 --- a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml @@ -145,5 +145,5 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml index a3c4a089e..5d3dbc780 100644 --- a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml @@ -113,5 +113,5 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml index 2ac1e893f..e02099679 100644 --- a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml @@ -107,5 +107,5 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/ComponentSources/ref/components.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/ComponentSources/ref/components.Debug+RteTest_ARMCM3.cbuild.yml index 810cfdfec..690436153 100644 --- a/tools/projmgr/test/data/TestSolution/ComponentSources/ref/components.Debug+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ComponentSources/ref/components.Debug+RteTest_ARMCM3.cbuild.yml @@ -85,7 +85,7 @@ build: packs: - pack: ARM::RteTest@0.1.0 components: - - component: ::RteTest:TemplateFile(API) + - component: RteTest:TemplateFile(API) - license: license-agreement: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/license.txt packs: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml index 3fb8a529c..a86cdfeba 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml index 8108fb8c5..1a9fefb02 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml index 312af7608..e50963f82 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml index 6f2babeed..606cf5a46 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml index 54e6c4e62..d99e3b4d0 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml index 19954c895..b2f927934 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml index 426dbe70a..6f3368f07 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml index b63f7a4bb..7e1eb8994 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml @@ -83,6 +83,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml index 65a187cba..57c6eca9a 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml @@ -83,6 +83,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml index abc10151a..5023403a4 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml @@ -83,6 +83,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml index f329c689d..9bbdfc7af 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml index 8e79f79b6..dd60b3c65 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml index 2f3ff893b..317b0b4ee 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml index 77fcb8d03..d72c7394c 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure-only.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure-only.cbuild.yml index d2eb201ba..b5cdf3a83 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure-only.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure-only.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml index 3e131427f..de1878844 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml @@ -86,6 +86,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml index efabb0cc2..ad865092d 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml @@ -84,6 +84,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml index b9366e2e8..f8545fd0d 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml @@ -86,6 +86,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml index d43bb473f..e65b6861a 100644 --- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml @@ -101,7 +101,7 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Board:Test:Rev1@1.1.1 - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml index 8285e8915..566a2a26a 100644 --- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml @@ -99,7 +99,7 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Board:Test:Rev1@1.1.1 - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml index a9e1e6a32..209124403 100644 --- a/tools/projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml @@ -82,6 +82,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.1.1 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml index a7d232d72..f306c0e26 100644 --- a/tools/projmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml @@ -89,6 +89,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml index a7c7439ed..417373053 100644 --- a/tools/projmgr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml @@ -78,7 +78,7 @@ build: packs: - pack: ARM::RteTest@0.1.0 components: - - component: ::RteTest:TemplateFile(API) + - component: RteTest:TemplateFile(API) - license: license-agreement: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/license.txt packs: diff --git a/tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml index df8424003..922d55364 100644 --- a/tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml @@ -91,6 +91,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml b/tools/projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml index 761642b25..565df2941 100644 --- a/tools/projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml @@ -91,6 +91,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml b/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml index d0f689011..92034c72a 100644 --- a/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml +++ b/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml @@ -158,6 +158,6 @@ build-gen: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild.yml index 884c1e9dc..2137bf61c 100644 --- a/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild.yml @@ -119,6 +119,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml index ca86bdcc6..2a012cc45 100644 --- a/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml @@ -197,6 +197,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml index 12f3ffe11..fa8d6a07b 100644 --- a/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml @@ -190,6 +190,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml index c9754ca82..a9e1d89d5 100644 --- a/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml @@ -128,6 +128,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml index 1d1c0f7df..159263458 100644 --- a/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml @@ -125,6 +125,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml index f19c8bb2c..b1a8ffe11 100644 --- a/tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml @@ -89,6 +89,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml index 4df8c02c8..692b3c715 100644 --- a/tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml @@ -81,6 +81,6 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) diff --git a/tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml index a25dd99b5..3c0735b9c 100644 --- a/tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml @@ -148,9 +148,9 @@ build: packs: - pack: ARM::RteTest_DFP@0.2.0 components: - - component: ::RteTest:CORE(API) - component: ARM::Device:Startup&RteTest Startup@2.0.3 - component: ARM::RteTest:CORE@0.1.1 + - component: RteTest:CORE(API) - license: BSD-3-Clause packs: - pack: ARM::RteTest@0.1.0 diff --git a/tools/projmgr/test/src/ProjMgrUnitTests.cpp b/tools/projmgr/test/src/ProjMgrUnitTests.cpp index 4ee5cc920..c53dc7e7a 100644 --- a/tools/projmgr/test/src/ProjMgrUnitTests.cpp +++ b/tools/projmgr/test/src/ProjMgrUnitTests.cpp @@ -3925,7 +3925,7 @@ TEST_F(ProjMgrUnitTests, Convert_ValidationResults_Dependencies) { argv[5] = (char*)"-c"; map testData = { - {"conflict+CM0", "warning csolution: dependency validation for context 'conflict+CM0' failed:\nCONFLICT ::RteTest:ApiExclusive(API)\n ARM::RteTest:ApiExclusive:S1\n ARM::RteTest:ApiExclusive:S2" }, + {"conflict+CM0", "warning csolution: dependency validation for context 'conflict+CM0' failed:\nCONFLICT RteTest:ApiExclusive(API)\n ARM::RteTest:ApiExclusive:S1\n ARM::RteTest:ApiExclusive:S2" }, {"incompatible+CM0", "warning csolution: dependency validation for context 'incompatible+CM0' failed:\nINCOMPATIBLE ARM::RteTest:Check:Incompatible@0.9.9\n deny RteTest:Dependency:Incompatible_component" }, {"incompatible-variant+CM0", "warning csolution: dependency validation for context 'incompatible-variant+CM0' failed:\nINCOMPATIBLE_VARIANT ARM::RteTest:Check:IncompatibleVariant@0.9.9\n require RteTest:Dependency:Variant&Compatible" }, {"missing+CM0", "warning csolution: dependency validation for context 'missing+CM0' failed:\nMISSING ARM::RteTest:Check:Missing@0.9.9\n require RteTest:Dependency:Missing" },