Skip to content

[projmgr] Handle --filter option case insensitive (#1340) #2250

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
Oct 27, 2025
Merged

[projmgr] Handle --filter option case insensitive (#1340) #2250

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
10 changes: 9 additions & 1 deletion libs/rteutils/include/RteUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
/******************************************************************************/
/*
* Copyright (c) 2020-2024 Arm Limited. All rights reserved.
* Copyright (c) 2020-2025 Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down Expand Up @@ -397,6 +397,14 @@ class RteUtils
* @return trimmed string without whitespace characters after newline character
*/
static std::string RemoveLeadingSpaces(const std::string& input);

/**
* @brief convert string characters to lower case
* @param input string
* @return string with lower case characters
*/
static std::string ToLower(const std::string& input);

// static constants
public:
static const std::string EMPTY_STRING;
Expand Down
11 changes: 9 additions & 2 deletions libs/rteutils/src/RteUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
/******************************************************************************/
/*
* Copyright (c) 2020-2024 Arm Limited. All rights reserved.
* Copyright (c) 2020-2025 Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down Expand Up @@ -621,7 +621,7 @@ void RteUtils::ApplyFilter(const vector<string>& origin, const set<string>& filt
if (word.empty()) {
continue;
}
if (item.find(word) == string::npos) {
if (RteUtils::ToLower(item).find(RteUtils::ToLower(word)) == string::npos) {
match = false;
break;
}
Expand All @@ -642,4 +642,11 @@ string RteUtils::RemoveLeadingSpaces(const string& input) {
return result;
}

string RteUtils::ToLower(const string& input) {
string output = input;
std::transform(output.begin(), output.end(), output.begin(),
[](unsigned char c) { return std::tolower(c); });
return output;
}

// End of RteUtils.cpp
10 changes: 9 additions & 1 deletion libs/rteutils/test/src/RteUtilsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2024 Arm Limited. All rights reserved.
* Copyright (c) 2020-2025 Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down Expand Up @@ -613,4 +613,12 @@ TEST(RteUtilsTest, RemoveLeadingSpaces) {
EXPECT_EQ(RteUtils::RemoveLeadingSpaces("Start\n"), "Start\n");
EXPECT_EQ(RteUtils::RemoveLeadingSpaces("Full"), "Full");
}

TEST(RteUtilsTest, ToLower) {
EXPECT_EQ(RteUtils::ToLower("ALL UPPER CASE"), "all upper case");
EXPECT_EQ(RteUtils::ToLower("all lower case"), "all lower case");
EXPECT_EQ(RteUtils::ToLower("Mixed Case"), "mixed case");
EXPECT_EQ(RteUtils::ToLower("Mixed Case And @$% Symbols_0H12AB"), "mixed case and @$% symbols_0h12ab");
}

// end of RteUtilsTest.cpp
3 changes: 2 additions & 1 deletion tools/projmgr/src/ProjMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,8 @@ bool ProjMgr::RunListDebuggers(void) {
debugger += "\n " + alias;
}
}
if (!m_filter.empty() && debugger.find(m_filter) == string::npos) {
if (!m_filter.empty() &&
RteUtils::ToLower(debugger).find(RteUtils::ToLower(m_filter)) == string::npos) {
continue;
}
debuggers.push_back(debugger);
Expand Down
13 changes: 7 additions & 6 deletions tools/projmgr/src/ProjMgrWorker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4383,15 +4383,16 @@ std::vector<ExampleItem> ProjMgrWorker::CollectExamples(const ContextItem& conte
}

template<class T> bool ProjMgrWorker::CheckFilter(const std::string& filter, const T& item) {
const bool nameFound = item.name.find(filter) != string::npos;
const bool packFound = item.pack.find(filter) != string::npos;
const bool descriptionFound = m_verbose ? item.description.find(filter) != string::npos : false;
const string filterNoCase = RteUtils::ToLower(filter);
const bool nameFound = RteUtils::ToLower(item.name).find(filterNoCase) != string::npos;
const bool packFound = RteUtils::ToLower(item.pack).find(filterNoCase) != string::npos;
const bool descriptionFound = m_verbose ? RteUtils::ToLower(item.description).find(filterNoCase) != string::npos : false;
bool boardFound = false;
if (m_verbose) {
for (const auto& board : item.boards) {
if (board.vendor.find(filter) != std::string::npos ||
board.name.find(filter) != std::string::npos ||
board.revision.find(filter) != std::string::npos) {
if (RteUtils::ToLower(board.vendor).find(filterNoCase) != std::string::npos ||
RteUtils::ToLower(board.name).find(filterNoCase) != std::string::npos ||
RteUtils::ToLower(board.revision).find(filterNoCase) != std::string::npos) {
boardFound = true;
break;
}
Expand Down
38 changes: 23 additions & 15 deletions tools/projmgr/test/src/ProjMgrUnitTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ TEST_F(ProjMgrUnitTests, RunProjMgr_ListBoards) {
argv[1] = (char*)"list";
argv[2] = (char*)"boards";
argv[3] = (char*)"--filter";
argv[4] = (char*)"Dummy";
argv[4] = (char*)"DUMMY";
EXPECT_EQ(0, RunProjMgr(5, argv, 0));

auto outStr = streamRedirect.GetOutString();
Expand Down Expand Up @@ -527,7 +527,7 @@ TEST_F(ProjMgrUnitTests, RunProjMgr_ListDevices) {
argv[1] = (char*)"list";
argv[2] = (char*)"devices";
argv[3] = (char*)"--filter";
argv[4] = (char*)"RteTest_ARMCM4";
argv[4] = (char*)"RTETest_ARMCM4";
EXPECT_EQ(0, RunProjMgr(5, argv, 0));

auto outStr = streamRedirect.GetOutString();
Expand Down Expand Up @@ -683,7 +683,7 @@ TEST_F(ProjMgrUnitTests, RunProjMgrContextSolution) {
argv[3] = (char*)"--solution";
argv[4] = (char*)csolution.c_str();
argv[5] = (char*)"--filter";
argv[6] = (char*)"test1";
argv[6] = (char*)"TEST1";
EXPECT_EQ(0, RunProjMgr(7, argv, 0));

auto outStr = streamRedirect.GetOutString();
Expand Down Expand Up @@ -2600,7 +2600,7 @@ TEST_F(ProjMgrUnitTests, ListPacks) {
vector<string> packs;
EXPECT_TRUE(m_worker.ParseContextSelection({}));
m_worker.SetLoadPacksPolicy(LoadPacksPolicy::ALL);
EXPECT_TRUE(m_worker.ListPacks(packs, false, "RteTest"));
EXPECT_TRUE(m_worker.ListPacks(packs, false, "RTETest"));
string allPacks;
for (auto& pack : packs) {
allPacks += pack + "\n";
Expand All @@ -2615,7 +2615,7 @@ TEST_F(ProjMgrUnitTests, ListPacksLatest) {
vector<string> packs;
EXPECT_TRUE(m_worker.ParseContextSelection({}));
m_worker.SetLoadPacksPolicy(LoadPacksPolicy::LATEST);
EXPECT_TRUE(m_worker.ListPacks(packs, false, "RteTest"));
EXPECT_TRUE(m_worker.ListPacks(packs, false, "RTETest"));
string latestPacks;
for (auto& pack : packs) {
latestPacks += pack + "\n";
Expand All @@ -2631,7 +2631,7 @@ TEST_F(ProjMgrUnitTests, ListBoards) {
};
vector<string> devices;
EXPECT_TRUE(m_worker.ParseContextSelection({}));
EXPECT_TRUE(m_worker.ListBoards(devices, "Dummy"));
EXPECT_TRUE(m_worker.ListBoards(devices, "DUMMY"));
EXPECT_EQ(expected, set<string>(devices.begin(), devices.end()));
}

Expand All @@ -2646,7 +2646,7 @@ TEST_F(ProjMgrUnitTests, ListDevices) {
};
vector<string> devices;
EXPECT_TRUE(m_worker.ParseContextSelection({}));
EXPECT_TRUE(m_worker.ListDevices(devices, "CM0"));
EXPECT_TRUE(m_worker.ListDevices(devices, "cm0"));
EXPECT_EQ(expected, set<string>(devices.begin(), devices.end()));
}

Expand All @@ -2660,7 +2660,7 @@ TEST_F(ProjMgrUnitTests, ListDevicesPackageFiltered) {
EXPECT_TRUE(m_parser.ParseCproject(filenameInput, false, true));
EXPECT_TRUE(m_worker.AddContexts(m_parser, descriptor, filenameInput));
EXPECT_TRUE(m_worker.ParseContextSelection({ "test" }));
EXPECT_TRUE(m_worker.ListDevices(devices, "CM3"));
EXPECT_TRUE(m_worker.ListDevices(devices, "cm3"));
EXPECT_EQ(expected, set<string>(devices.begin(), devices.end()));
}

Expand All @@ -2670,7 +2670,7 @@ TEST_F(ProjMgrUnitTests, ListComponents) {
};
vector<string> components;
EXPECT_TRUE(m_worker.ParseContextSelection({}));
EXPECT_TRUE(m_worker.ListComponents(components, "Device:Startup"));
EXPECT_TRUE(m_worker.ListComponents(components, "DEVICE:STARTUP"));
EXPECT_EQ(expected, set<string>(components.begin(), components.end()));
}

Expand Down Expand Up @@ -2698,7 +2698,7 @@ TEST_F(ProjMgrUnitTests, ListDependencies) {
EXPECT_TRUE(m_parser.ParseCproject(filenameInput, false, true));
EXPECT_TRUE(m_worker.AddContexts(m_parser, descriptor, filenameInput));
EXPECT_TRUE(m_worker.ParseContextSelection({ "test-dependency" }));
EXPECT_TRUE(m_worker.ListDependencies(dependencies, "CORE"));
EXPECT_TRUE(m_worker.ListDependencies(dependencies, "Core"));
EXPECT_EQ(expected, set<string>(dependencies.begin(), dependencies.end()));
}

Expand Down Expand Up @@ -4790,7 +4790,7 @@ TEST_F(ProjMgrUnitTests, RunProjMgr_UpdateRte) {
string csolutionFile = testinput_folder + "/TestSolution/test.csolution.yml";
RemoveCbuildSetFile(csolutionFile);

char* argv[9];
char* argv[11];
argv[0] = (char*)"";
argv[1] = (char*)"update-rte";
argv[2] = (char*)csolutionFile.c_str();
Expand Down Expand Up @@ -4835,6 +4835,14 @@ info csolution: config files for each component:\n\
"../TestProject1/RTE/Device/RteTest_ARMCM0/startup_ARMCM0.c@2.0.1 (update@2.0.3) from ARM::Device:Startup&RteTest Startup@2.0.3\n"\
"../TestProject1/RTE/Device/RteTest_ARMCM0/system_ARMCM0.c@1.0.0 (up to date) from ARM::Device:Startup&RteTest Startup@2.0.3\n";
EXPECT_EQ(outStr, expected1);

streamRedirect.ClearStringStreams();
argv[9] = (char*)"-f";
argv[10] = (char*)"DBGCONF";
EXPECT_EQ(0, RunProjMgr(11, argv, m_envp));
outStr = streamRedirect.GetOutString();
const string expected2 = "../.cmsis/test+CM0.dbgconf@0.0.2 (up to date)\n";
EXPECT_EQ(outStr, expected2);
}

TEST_F(ProjMgrUnitTests, RunProjMgr_ListConfigsWithoutInput) {
Expand Down Expand Up @@ -6857,7 +6865,7 @@ TEST_F(ProjMgrUnitTests, ListTargetSets) {

streamRedirect.ClearStringStreams();
argv[4] = (char*)"--filter";
argv[5] = (char*)"Type2";
argv[5] = (char*)"TYPE2";
EXPECT_EQ(0, RunProjMgr(6, argv, 0));

outStr = streamRedirect.GetOutString();
Expand Down Expand Up @@ -6940,7 +6948,7 @@ PreIncludeEnvFolder@1.0.0 (ARM::RteTest@0.1.0)\n\
// test with filter option
streamRedirect.ClearStringStreams();
argv[6] = (char*)"--filter";
argv[7] = (char*)"EnvFolder";
argv[7] = (char*)"ENVFOLDER";
EXPECT_EQ(0, RunProjMgr(8, argv, 0));
outStr = streamRedirect.GetOutString();
EXPECT_STREQ(outStr.c_str(), "\
Expand Down Expand Up @@ -6984,7 +6992,7 @@ Board3 (ARM::RteTest_DFP@0.2.0)\n\

// test filter
argv[3] = (char*)"--filter";
argv[4] = (char*)"Board1";
argv[4] = (char*)"BOARD1";
streamRedirect.ClearStringStreams();
EXPECT_EQ(0, RunProjMgr(5, argv, 0));
outStr = streamRedirect.GetOutString();
Expand Down Expand Up @@ -7146,7 +7154,7 @@ Keil uVision\n\
streamRedirect.ClearStringStreams();
argv[3] = (char*)"--verbose";
argv[4] = (char*)"--filter";
argv[5] = (char*)"CMSIS-DAP";
argv[5] = (char*)"Cmsis-Dap";
EXPECT_EQ(0, RunProjMgr(6, argv, m_envp));
outStr = streamRedirect.GetOutString();
EXPECT_TRUE(regex_search(outStr, regex("\
Expand Down
Loading