From efd0d225ccd3cf3a6833ae307c9f5ae654a062aa Mon Sep 17 00:00:00 2001 From: Thorsten de Buhr Date: Wed, 29 Jul 2026 09:06:02 +0200 Subject: [PATCH 1/5] [svdconv] Generate position/mask macros for dim fields Fixes Open-CMSIS-Pack/devtools#2439 Signed-off-by: Thorsten de Buhr --- .../SVDGenerator/src/HeaderData_PosMask.cpp | 17 +++++ .../Test/data/posMaskDim/PosMaskDim.svd | 74 +++++++++++++++++++ .../Test/integtests/src/SvdConvIntegTests.cpp | 49 ++++++++++++ 3 files changed, 140 insertions(+) create mode 100644 tools/svdconv/Test/data/posMaskDim/PosMaskDim.svd diff --git a/tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp b/tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp index 131c50f61..5c48fce98 100644 --- a/tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp +++ b/tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp @@ -183,6 +183,23 @@ bool HeaderData::CreateRegisterPosMask(SvdRegister* reg, PosMaskNames *posMaskNa continue; } + const auto dim = field->GetDimension(); + if(dim) { + const auto expr = dim->GetExpression(); + if(expr && expr->GetType() == SvdTypes::Expression::EXTEND) { + const auto& dimChilds = dim->GetChildren(); + for(const auto dimChild : dimChilds) { + const auto dimField = dynamic_cast(dimChild); + if(!dimField || !dimField->IsValid()) { + continue; + } + + CreateFieldPosMask(dimField, posMaskNames); + } + continue; + } + } + CreateFieldPosMask(field, posMaskNames); } diff --git a/tools/svdconv/Test/data/posMaskDim/PosMaskDim.svd b/tools/svdconv/Test/data/posMaskDim/PosMaskDim.svd new file mode 100644 index 000000000..671e6b3cb --- /dev/null +++ b/tools/svdconv/Test/data/posMaskDim/PosMaskDim.svd @@ -0,0 +1,74 @@ + + + + ARM Ltd. + ARM + PosMaskDim + ARM Cortex M3 + 1.0 + Test device for dim fields in pos/mask generation. + + + CM3 + r2p1 + little + true + false + true + 3 + false + + + 8 + 32 + 32 + read-write + 0x00000000 + 0xFFFFFFFF + + + + TIM + Timer. + 0x40000000 + + 0x0 + 0x400 + registers + + + + DATA[%s] + Data register. + 0x0 + 256 + 4 + 32 + + + PIN%s + Pin data. + 0 + 1 + 8 + 1 + 0-7 + + + Disabled + Channel disabled. + 0 + + + Enabled + Channel enabled. + 1 + + + + + + + + + diff --git a/tools/svdconv/Test/integtests/src/SvdConvIntegTests.cpp b/tools/svdconv/Test/integtests/src/SvdConvIntegTests.cpp index f50f74b24..a038befa1 100644 --- a/tools/svdconv/Test/integtests/src/SvdConvIntegTests.cpp +++ b/tools/svdconv/Test/integtests/src/SvdConvIntegTests.cpp @@ -13,6 +13,7 @@ #include #include #include +#include using namespace std; using namespace testing; @@ -203,3 +204,51 @@ TEST_F(SvdConvIntegTests, CheckResetMask) { } } +TEST_F(SvdConvIntegTests, CheckPosMaskDimFields) { + const string& inFile = SvdConvIntegTestEnv::localtestdata_dir + "/posMaskDim/PosMaskDim.svd"; + const string testOut = SvdConvIntegTestEnv::testoutput_dir + "/posMaskDim"; + ASSERT_TRUE(RteFsUtils::Exists(inFile)); + + Arguments args("SVDConv.exe", inFile); + args.add({ "-o", testOut, "--generate=header", "--fields=macro", "--create-folder" }); + + SvdConv svdConv; + EXPECT_EQ(0, svdConv.Check(args, args, nullptr)); + + const string testOutHeader = testOut + "/PosMaskDim.h"; + ASSERT_TRUE(RteFsUtils::Exists(testOutHeader)); + + string buf; + RteFsUtils::ReadFile(testOutHeader, buf); + ASSERT_FALSE(buf.empty()); + + const vector> expectedMacros = { + { "#define TIM_DATA_PIN0_Pos", "(0UL)" }, + { "#define TIM_DATA_PIN0_Msk", "(0x1UL)" }, + { "#define TIM_DATA_PIN1_Pos", "(1UL)" }, + { "#define TIM_DATA_PIN1_Msk", "(0x2UL)" }, + { "#define TIM_DATA_PIN2_Pos", "(2UL)" }, + { "#define TIM_DATA_PIN2_Msk", "(0x4UL)" }, + { "#define TIM_DATA_PIN3_Pos", "(3UL)" }, + { "#define TIM_DATA_PIN3_Msk", "(0x8UL)" }, + { "#define TIM_DATA_PIN4_Pos", "(4UL)" }, + { "#define TIM_DATA_PIN4_Msk", "(0x10UL)" }, + { "#define TIM_DATA_PIN5_Pos", "(5UL)" }, + { "#define TIM_DATA_PIN5_Msk", "(0x20UL)" }, + { "#define TIM_DATA_PIN6_Pos", "(6UL)" }, + { "#define TIM_DATA_PIN6_Msk", "(0x40UL)" }, + { "#define TIM_DATA_PIN7_Pos", "(7UL)" }, + { "#define TIM_DATA_PIN7_Msk", "(0x80UL)" }, + }; + for(const auto& [name, value] : expectedMacros) { + const auto namePos = buf.find(name); + ASSERT_NE(string::npos, namePos) << name; + const auto lineEnd = buf.find('\n', namePos); + const auto valuePos = buf.find(value, namePos); + ASSERT_NE(string::npos, valuePos) << name; + EXPECT_LT(valuePos, lineEnd) << name; + } + + EXPECT_EQ(string::npos, buf.find("#define TIM_DATA_PIN_Pos")); + EXPECT_EQ(string::npos, buf.find("#define TIM_DATA_PIN_Msk")); +} From 0fbf77da0d47e3280cf82568c0ea5749105d240b Mon Sep 17 00:00:00 2001 From: Thorsten de Buhr Date: Wed, 29 Jul 2026 09:46:32 +0200 Subject: [PATCH 2/5] [svdconv] Improve dim field position/mask coverage Signed-off-by: Thorsten de Buhr --- .../SVDGenerator/src/HeaderData_PosMask.cpp | 2 +- tools/svdconv/Test/UnitTests/CMakeLists.txt | 2 +- .../Test/UnitTests/src/GeneratorTest.cpp | 70 +++++++++++++++++++ 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp b/tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp index 5c48fce98..216257e62 100644 --- a/tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp +++ b/tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp @@ -186,7 +186,7 @@ bool HeaderData::CreateRegisterPosMask(SvdRegister* reg, PosMaskNames *posMaskNa const auto dim = field->GetDimension(); if(dim) { const auto expr = dim->GetExpression(); - if(expr && expr->GetType() == SvdTypes::Expression::EXTEND) { + if(expr->GetType() == SvdTypes::Expression::EXTEND) { const auto& dimChilds = dim->GetChildren(); for(const auto dimChild : dimChilds) { const auto dimField = dynamic_cast(dimChild); diff --git a/tools/svdconv/Test/UnitTests/CMakeLists.txt b/tools/svdconv/Test/UnitTests/CMakeLists.txt index d9a7d502f..a52befc41 100644 --- a/tools/svdconv/Test/UnitTests/CMakeLists.txt +++ b/tools/svdconv/Test/UnitTests/CMakeLists.txt @@ -13,7 +13,7 @@ set_property(TARGET SVDConvUnitTests PROPERTY set_property(TARGET SVDConvUnitTests PROPERTY VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -target_link_libraries(SVDConvUnitTests PUBLIC SVDModel SVDGenerator gtest_main) +target_link_libraries(SVDConvUnitTests PUBLIC svdconvlib gtest_main) add_test(NAME SVDConvUnitTests COMMAND SVDConvUnitTests --gtest_output=xml:test_reports/svdconvunittests-report-${SYSTEM}-${CPU_ARCH}$<$:_cov>.xml diff --git a/tools/svdconv/Test/UnitTests/src/GeneratorTest.cpp b/tools/svdconv/Test/UnitTests/src/GeneratorTest.cpp index 47d3b4732..fb0721b56 100644 --- a/tools/svdconv/Test/UnitTests/src/GeneratorTest.cpp +++ b/tools/svdconv/Test/UnitTests/src/GeneratorTest.cpp @@ -4,8 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 */ #include "CodeGenerator.h" +#include "HeaderData.h" +#include "SvdDimension.h" +#include "SvdField.h" +#include "SvdRegister.h" #include "gtest/gtest.h" +#include #include using namespace std; @@ -25,5 +30,70 @@ TEST(CodeGenerator, Check) { } +namespace { + +class RootItem : public SvdItem { +public: + RootItem() : SvdItem(nullptr) {} + + const string& GetPrependToName() override { return m_empty; } + const string& GetAppendToName() override { return m_empty; } + +private: + const string m_empty; +}; + +class TestHeaderData : public HeaderData { +public: + using HeaderData::HeaderData; + using HeaderData::CreateRegisterPosMask; +}; + +SvdField* AddField(SvdItem* parent, const string& name, uint32_t offset) { + const auto field = new SvdField(parent); + field->SetName(name); + field->SetOffset(offset); + field->SetBitWidth(1); + parent->AddItem(field); + return field; +} + +} // namespace + + +TEST(HeaderData, CreateRegisterPosMaskHandlesDimensionVariants) { + SvdOptions options; + FileHeaderInfo fileHeaderInfo; + TestHeaderData headerData(fileHeaderInfo, options); + + auto root = make_unique(); + const auto reg = new SvdRegister(root.get()); + reg->SetName("CTRL"); + root->AddItem(reg); + + const auto fields = new SvdFieldContainer(reg); + reg->AddItem(fields); + AddField(fields, "PLAIN", 0); + + const auto arrayField = AddField(fields, "ARRAY", 1); + const auto arrayDim = new SvdDimension(arrayField); + arrayDim->GetExpression()->SetType(SvdTypes::Expression::ARRAY); + arrayField->SetDimension(arrayDim); + + const auto extendField = AddField(fields, "EXTEND%s", 2); + const auto extendDim = new SvdDimension(extendField); + extendDim->GetExpression()->SetType(SvdTypes::Expression::EXTEND); + extendField->SetDimension(extendDim); + + AddField(extendDim, "EXTEND0", 2); + const auto invalidField = AddField(extendDim, "EXTEND1", 3); + invalidField->SetValid(false); + extendDim->AddItem(new SvdItem(extendDim)); + + PosMaskNames names; + names.name = "TEST"; + EXPECT_TRUE(headerData.CreateRegisterPosMask(reg, &names)); +} + From 155ca4acf6ca296797e6a863c5cbe1c076cf3e59 Mon Sep 17 00:00:00 2001 From: Thorsten de Buhr Date: Wed, 29 Jul 2026 10:06:36 +0200 Subject: [PATCH 3/5] [svdconv] Restore dimension expression null check Signed-off-by: Thorsten de Buhr --- tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp b/tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp index 216257e62..5c48fce98 100644 --- a/tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp +++ b/tools/svdconv/SVDGenerator/src/HeaderData_PosMask.cpp @@ -186,7 +186,7 @@ bool HeaderData::CreateRegisterPosMask(SvdRegister* reg, PosMaskNames *posMaskNa const auto dim = field->GetDimension(); if(dim) { const auto expr = dim->GetExpression(); - if(expr->GetType() == SvdTypes::Expression::EXTEND) { + if(expr && expr->GetType() == SvdTypes::Expression::EXTEND) { const auto& dimChilds = dim->GetChildren(); for(const auto dimChild : dimChilds) { const auto dimField = dynamic_cast(dimChild); From 88585c3ce6dcb0a1d6dd102c88b16a2a36585582 Mon Sep 17 00:00:00 2001 From: Thorsten de Buhr Date: Wed, 29 Jul 2026 11:31:16 +0200 Subject: [PATCH 4/5] Rename SVDConv test directory --- .github/workflows/cpp-linter.yml | 2 +- tools/svdconv/CMakeLists.txt | 6 +++--- tools/svdconv/SVDConv/cmdFile.cf.in | 2 +- tools/svdconv/jenkins/pipeline.groovy | 2 +- tools/svdconv/{Test => test}/CONTENT.md | 0 tools/svdconv/{Test => test}/UnitTests/CMakeLists.txt | 0 .../svdconv/{Test => test}/UnitTests/src/GeneratorTest.cpp | 0 tools/svdconv/{Test => test}/UnitTests/src/SvdUtilsTest.cpp | 0 tools/svdconv/{Test => test}/data/CMakeLists.txt | 0 tools/svdconv/{Test => test}/data/ResetMask/ResetMask.svd | 0 .../accViolationDisableCond/accViolationDisableCond.xml | 0 .../{Test => test}/data/cmdlineParser/DisableCondTest.svd | 0 .../data/disablecondition/DisableCondTest.svd | 0 .../svdconv/{Test => test}/data/nameHasBrackets/SVDTiny.svd | 0 tools/svdconv/{Test => test}/data/option_n/option_n.svd | 0 tools/svdconv/{Test => test}/data/posMaskDim/PosMaskDim.svd | 0 tools/svdconv/{Test => test}/data/sauConfig/SSE300_errs.svd | 0 tools/svdconv/{Test => test}/data/sauConfig/SSE300_ok.svd | 0 tools/svdconv/{Test => test}/integtests/CMakeLists.txt | 0 .../{Test => test}/integtests/include/SvdConvIntegTestEnv.h | 0 .../{Test => test}/integtests/include/SvdConvTestUtils.h | 0 .../{Test => test}/integtests/src/SvdConvIntegTestEnv.cpp | 0 .../{Test => test}/integtests/src/SvdConvIntegTests.cpp | 0 .../{Test => test}/integtests/src/SvdConvTestCmdLine.cpp | 0 .../{Test => test}/integtests/src/SvdConvTestUtils.cpp | 0 25 files changed, 6 insertions(+), 6 deletions(-) rename tools/svdconv/{Test => test}/CONTENT.md (100%) rename tools/svdconv/{Test => test}/UnitTests/CMakeLists.txt (100%) rename tools/svdconv/{Test => test}/UnitTests/src/GeneratorTest.cpp (100%) rename tools/svdconv/{Test => test}/UnitTests/src/SvdUtilsTest.cpp (100%) rename tools/svdconv/{Test => test}/data/CMakeLists.txt (100%) rename tools/svdconv/{Test => test}/data/ResetMask/ResetMask.svd (100%) rename tools/svdconv/{Test => test}/data/accViolationDisableCond/accViolationDisableCond.xml (100%) rename tools/svdconv/{Test => test}/data/cmdlineParser/DisableCondTest.svd (100%) rename tools/svdconv/{Test => test}/data/disablecondition/DisableCondTest.svd (100%) rename tools/svdconv/{Test => test}/data/nameHasBrackets/SVDTiny.svd (100%) rename tools/svdconv/{Test => test}/data/option_n/option_n.svd (100%) rename tools/svdconv/{Test => test}/data/posMaskDim/PosMaskDim.svd (100%) rename tools/svdconv/{Test => test}/data/sauConfig/SSE300_errs.svd (100%) rename tools/svdconv/{Test => test}/data/sauConfig/SSE300_ok.svd (100%) rename tools/svdconv/{Test => test}/integtests/CMakeLists.txt (100%) rename tools/svdconv/{Test => test}/integtests/include/SvdConvIntegTestEnv.h (100%) rename tools/svdconv/{Test => test}/integtests/include/SvdConvTestUtils.h (100%) rename tools/svdconv/{Test => test}/integtests/src/SvdConvIntegTestEnv.cpp (100%) rename tools/svdconv/{Test => test}/integtests/src/SvdConvIntegTests.cpp (100%) rename tools/svdconv/{Test => test}/integtests/src/SvdConvTestCmdLine.cpp (100%) rename tools/svdconv/{Test => test}/integtests/src/SvdConvTestUtils.cpp (100%) diff --git a/.github/workflows/cpp-linter.yml b/.github/workflows/cpp-linter.yml index c31fdf5d8..80e072320 100644 --- a/.github/workflows/cpp-linter.yml +++ b/.github/workflows/cpp-linter.yml @@ -54,7 +54,7 @@ jobs: --platform=unix64 --std=c++17 --verbose --std=c++17 \ -i./tools/buildmgr/test -i./tools/packchk/test \ -i./tools/packgen/test -i./tools/projmgr/test \ - -i./tools/svdconv/Test -i./test \ + -i./tools/svdconv/test -i./test \ --template="|{file}|{line}|{severity}|{message}|" \ --output-file=./${{ env.linter_report }} . diff --git a/tools/svdconv/CMakeLists.txt b/tools/svdconv/CMakeLists.txt index 06a9954b1..777e16702 100644 --- a/tools/svdconv/CMakeLists.txt +++ b/tools/svdconv/CMakeLists.txt @@ -13,6 +13,6 @@ add_subdirectory(SVDModel) add_subdirectory(SVDGenerator) add_subdirectory(SVDConv) -add_subdirectory(Test/data) -add_subdirectory(Test/UnitTests) -add_subdirectory(Test/integtests) +add_subdirectory(test/data) +add_subdirectory(test/UnitTests) +add_subdirectory(test/integtests) diff --git a/tools/svdconv/SVDConv/cmdFile.cf.in b/tools/svdconv/SVDConv/cmdFile.cf.in index 4004b067d..a4aaad384 100644 --- a/tools/svdconv/SVDConv/cmdFile.cf.in +++ b/tools/svdconv/SVDConv/cmdFile.cf.in @@ -1,4 +1,4 @@ -"@CMAKE_CURRENT_SOURCE_DIR@/../Test/SDCMSIS-1369/test.svd" +"@CMAKE_CURRENT_SOURCE_DIR@/../test/SDCMSIS-1369/test.svd" -o "@CMAKE_CURRENT_BINARY_DIR@/Output" -b "@CMAKE_CURRENT_BINARY_DIR@/Output/error.log" --create-folder diff --git a/tools/svdconv/jenkins/pipeline.groovy b/tools/svdconv/jenkins/pipeline.groovy index a5350e65a..f4b8be900 100644 --- a/tools/svdconv/jenkins/pipeline.groovy +++ b/tools/svdconv/jenkins/pipeline.groovy @@ -12,7 +12,7 @@ def baseFolderWin = baseFolder.replaceAll('/', '\\\\') def buildFolder = 'build' def target = "SVDConv" def unittest = "SVDConvUnitTests" -def unittestFolder = "tools/svdconv/Test/UnitTests" +def unittestFolder = "tools/svdconv/test/UnitTests" def unittestFolderWin = unittestFolder.replaceAll('/', '\\\\') // pipeline controlling variables diff --git a/tools/svdconv/Test/CONTENT.md b/tools/svdconv/test/CONTENT.md similarity index 100% rename from tools/svdconv/Test/CONTENT.md rename to tools/svdconv/test/CONTENT.md diff --git a/tools/svdconv/Test/UnitTests/CMakeLists.txt b/tools/svdconv/test/UnitTests/CMakeLists.txt similarity index 100% rename from tools/svdconv/Test/UnitTests/CMakeLists.txt rename to tools/svdconv/test/UnitTests/CMakeLists.txt diff --git a/tools/svdconv/Test/UnitTests/src/GeneratorTest.cpp b/tools/svdconv/test/UnitTests/src/GeneratorTest.cpp similarity index 100% rename from tools/svdconv/Test/UnitTests/src/GeneratorTest.cpp rename to tools/svdconv/test/UnitTests/src/GeneratorTest.cpp diff --git a/tools/svdconv/Test/UnitTests/src/SvdUtilsTest.cpp b/tools/svdconv/test/UnitTests/src/SvdUtilsTest.cpp similarity index 100% rename from tools/svdconv/Test/UnitTests/src/SvdUtilsTest.cpp rename to tools/svdconv/test/UnitTests/src/SvdUtilsTest.cpp diff --git a/tools/svdconv/Test/data/CMakeLists.txt b/tools/svdconv/test/data/CMakeLists.txt similarity index 100% rename from tools/svdconv/Test/data/CMakeLists.txt rename to tools/svdconv/test/data/CMakeLists.txt diff --git a/tools/svdconv/Test/data/ResetMask/ResetMask.svd b/tools/svdconv/test/data/ResetMask/ResetMask.svd similarity index 100% rename from tools/svdconv/Test/data/ResetMask/ResetMask.svd rename to tools/svdconv/test/data/ResetMask/ResetMask.svd diff --git a/tools/svdconv/Test/data/accViolationDisableCond/accViolationDisableCond.xml b/tools/svdconv/test/data/accViolationDisableCond/accViolationDisableCond.xml similarity index 100% rename from tools/svdconv/Test/data/accViolationDisableCond/accViolationDisableCond.xml rename to tools/svdconv/test/data/accViolationDisableCond/accViolationDisableCond.xml diff --git a/tools/svdconv/Test/data/cmdlineParser/DisableCondTest.svd b/tools/svdconv/test/data/cmdlineParser/DisableCondTest.svd similarity index 100% rename from tools/svdconv/Test/data/cmdlineParser/DisableCondTest.svd rename to tools/svdconv/test/data/cmdlineParser/DisableCondTest.svd diff --git a/tools/svdconv/Test/data/disablecondition/DisableCondTest.svd b/tools/svdconv/test/data/disablecondition/DisableCondTest.svd similarity index 100% rename from tools/svdconv/Test/data/disablecondition/DisableCondTest.svd rename to tools/svdconv/test/data/disablecondition/DisableCondTest.svd diff --git a/tools/svdconv/Test/data/nameHasBrackets/SVDTiny.svd b/tools/svdconv/test/data/nameHasBrackets/SVDTiny.svd similarity index 100% rename from tools/svdconv/Test/data/nameHasBrackets/SVDTiny.svd rename to tools/svdconv/test/data/nameHasBrackets/SVDTiny.svd diff --git a/tools/svdconv/Test/data/option_n/option_n.svd b/tools/svdconv/test/data/option_n/option_n.svd similarity index 100% rename from tools/svdconv/Test/data/option_n/option_n.svd rename to tools/svdconv/test/data/option_n/option_n.svd diff --git a/tools/svdconv/Test/data/posMaskDim/PosMaskDim.svd b/tools/svdconv/test/data/posMaskDim/PosMaskDim.svd similarity index 100% rename from tools/svdconv/Test/data/posMaskDim/PosMaskDim.svd rename to tools/svdconv/test/data/posMaskDim/PosMaskDim.svd diff --git a/tools/svdconv/Test/data/sauConfig/SSE300_errs.svd b/tools/svdconv/test/data/sauConfig/SSE300_errs.svd similarity index 100% rename from tools/svdconv/Test/data/sauConfig/SSE300_errs.svd rename to tools/svdconv/test/data/sauConfig/SSE300_errs.svd diff --git a/tools/svdconv/Test/data/sauConfig/SSE300_ok.svd b/tools/svdconv/test/data/sauConfig/SSE300_ok.svd similarity index 100% rename from tools/svdconv/Test/data/sauConfig/SSE300_ok.svd rename to tools/svdconv/test/data/sauConfig/SSE300_ok.svd diff --git a/tools/svdconv/Test/integtests/CMakeLists.txt b/tools/svdconv/test/integtests/CMakeLists.txt similarity index 100% rename from tools/svdconv/Test/integtests/CMakeLists.txt rename to tools/svdconv/test/integtests/CMakeLists.txt diff --git a/tools/svdconv/Test/integtests/include/SvdConvIntegTestEnv.h b/tools/svdconv/test/integtests/include/SvdConvIntegTestEnv.h similarity index 100% rename from tools/svdconv/Test/integtests/include/SvdConvIntegTestEnv.h rename to tools/svdconv/test/integtests/include/SvdConvIntegTestEnv.h diff --git a/tools/svdconv/Test/integtests/include/SvdConvTestUtils.h b/tools/svdconv/test/integtests/include/SvdConvTestUtils.h similarity index 100% rename from tools/svdconv/Test/integtests/include/SvdConvTestUtils.h rename to tools/svdconv/test/integtests/include/SvdConvTestUtils.h diff --git a/tools/svdconv/Test/integtests/src/SvdConvIntegTestEnv.cpp b/tools/svdconv/test/integtests/src/SvdConvIntegTestEnv.cpp similarity index 100% rename from tools/svdconv/Test/integtests/src/SvdConvIntegTestEnv.cpp rename to tools/svdconv/test/integtests/src/SvdConvIntegTestEnv.cpp diff --git a/tools/svdconv/Test/integtests/src/SvdConvIntegTests.cpp b/tools/svdconv/test/integtests/src/SvdConvIntegTests.cpp similarity index 100% rename from tools/svdconv/Test/integtests/src/SvdConvIntegTests.cpp rename to tools/svdconv/test/integtests/src/SvdConvIntegTests.cpp diff --git a/tools/svdconv/Test/integtests/src/SvdConvTestCmdLine.cpp b/tools/svdconv/test/integtests/src/SvdConvTestCmdLine.cpp similarity index 100% rename from tools/svdconv/Test/integtests/src/SvdConvTestCmdLine.cpp rename to tools/svdconv/test/integtests/src/SvdConvTestCmdLine.cpp diff --git a/tools/svdconv/Test/integtests/src/SvdConvTestUtils.cpp b/tools/svdconv/test/integtests/src/SvdConvTestUtils.cpp similarity index 100% rename from tools/svdconv/Test/integtests/src/SvdConvTestUtils.cpp rename to tools/svdconv/test/integtests/src/SvdConvTestUtils.cpp From c9ffd4a06db548b2b817140549f8962c1395f3b9 Mon Sep 17 00:00:00 2001 From: Thorsten de Buhr Date: Wed, 29 Jul 2026 11:33:35 +0200 Subject: [PATCH 5/5] Rename SVDConv unit test directory --- tools/svdconv/CMakeLists.txt | 2 +- tools/svdconv/jenkins/pipeline.groovy | 2 +- tools/svdconv/test/{UnitTests => unittests}/CMakeLists.txt | 0 .../svdconv/test/{UnitTests => unittests}/src/GeneratorTest.cpp | 0 .../svdconv/test/{UnitTests => unittests}/src/SvdUtilsTest.cpp | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename tools/svdconv/test/{UnitTests => unittests}/CMakeLists.txt (100%) rename tools/svdconv/test/{UnitTests => unittests}/src/GeneratorTest.cpp (100%) rename tools/svdconv/test/{UnitTests => unittests}/src/SvdUtilsTest.cpp (100%) diff --git a/tools/svdconv/CMakeLists.txt b/tools/svdconv/CMakeLists.txt index 777e16702..f3c1c4e29 100644 --- a/tools/svdconv/CMakeLists.txt +++ b/tools/svdconv/CMakeLists.txt @@ -14,5 +14,5 @@ add_subdirectory(SVDGenerator) add_subdirectory(SVDConv) add_subdirectory(test/data) -add_subdirectory(test/UnitTests) +add_subdirectory(test/unittests) add_subdirectory(test/integtests) diff --git a/tools/svdconv/jenkins/pipeline.groovy b/tools/svdconv/jenkins/pipeline.groovy index f4b8be900..0d5089009 100644 --- a/tools/svdconv/jenkins/pipeline.groovy +++ b/tools/svdconv/jenkins/pipeline.groovy @@ -12,7 +12,7 @@ def baseFolderWin = baseFolder.replaceAll('/', '\\\\') def buildFolder = 'build' def target = "SVDConv" def unittest = "SVDConvUnitTests" -def unittestFolder = "tools/svdconv/test/UnitTests" +def unittestFolder = "tools/svdconv/test/unittests" def unittestFolderWin = unittestFolder.replaceAll('/', '\\\\') // pipeline controlling variables diff --git a/tools/svdconv/test/UnitTests/CMakeLists.txt b/tools/svdconv/test/unittests/CMakeLists.txt similarity index 100% rename from tools/svdconv/test/UnitTests/CMakeLists.txt rename to tools/svdconv/test/unittests/CMakeLists.txt diff --git a/tools/svdconv/test/UnitTests/src/GeneratorTest.cpp b/tools/svdconv/test/unittests/src/GeneratorTest.cpp similarity index 100% rename from tools/svdconv/test/UnitTests/src/GeneratorTest.cpp rename to tools/svdconv/test/unittests/src/GeneratorTest.cpp diff --git a/tools/svdconv/test/UnitTests/src/SvdUtilsTest.cpp b/tools/svdconv/test/unittests/src/SvdUtilsTest.cpp similarity index 100% rename from tools/svdconv/test/UnitTests/src/SvdUtilsTest.cpp rename to tools/svdconv/test/unittests/src/SvdUtilsTest.cpp