Skip to content
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.

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

CR-1219118 fix : Order of validate tests and reports should be same as shown in help #8744

Merged
merged 1 commit into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions src/runtime_src/core/tools/common/SubCmdExamineInternal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,15 @@ SubCmdExamineInternal::getReportsList(const xrt_core::smi::tuple_vector& reports
// Vector to store the matched reports
std::vector<std::shared_ptr<Report>> matchedReports;

for (const auto& report : fullReportCollection) {
auto it = std::find_if(reports.begin(), reports.end(),
[&report](const std::tuple<std::string, std::string, std::string>& rep) {
return (std::get<0>(rep) == report->getReportName() &&
(std::get<2>(rep) != "hidden" || XBU::getShowHidden()));
});

if (it != reports.end()) {
matchedReports.push_back(report);
for (const auto& rep : reports) {
auto it = std::find_if(fullReportCollection.begin(), fullReportCollection.end(),
[&rep](const std::shared_ptr<Report>& report) {
return std::get<0>(rep) == report->getReportName() &&
(std::get<2>(rep) != "hidden" || XBU::getShowHidden());
});

if (it != fullReportCollection.end()) {
matchedReports.push_back(*it);
}
}

Expand Down
18 changes: 9 additions & 9 deletions src/runtime_src/core/tools/xbutil2/SubCmdValidate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -715,15 +715,15 @@ SubCmdValidate::getTestList(const xrt_core::smi::tuple_vector& tests) const
// Vector to store the matched tests
std::vector<std::shared_ptr<TestRunner>> matchedTests;

for (const auto& runner : testSuite) {
auto it = std::find_if(tests.begin(), tests.end(),
[&runner](const std::tuple<std::string, std::string, std::string>& test) {
return (std::get<0>(test) == runner->getConfigName() &&
(std::get<2>(test) != "hidden" || XBU::getShowHidden()));
});

if (it != tests.end()) {
matchedTests.push_back(runner);
for (const auto& test : tests) {
auto it = std::find_if(testSuite.begin(), testSuite.end(),
[&test](const std::shared_ptr<TestRunner>& runner) {
return std::get<0>(test) == runner->getConfigName() &&
(std::get<2>(test) != "hidden" || XBU::getShowHidden());
});

if (it != testSuite.end()) {
matchedTests.push_back(*it);
}
}
return matchedTests;
Expand Down
Loading