Skip to content

Commit

Permalink
GTEST/UCT: Add ability to filter by resource or md name
Browse files Browse the repository at this point in the history
  • Loading branch information
tvegas1 committed Oct 2, 2024
1 parent 875125b commit cee33df
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
5 changes: 4 additions & 1 deletion test/gtest/uct/test_md.cc
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,14 @@ void test_md::test_reg_mem(unsigned access_mask,
std::vector<test_md_param> test_md::enum_mds(const std::string& cmpt_name) {

std::vector<md_resource> md_resources = enum_md_resources();
static const char *str = getenv("GTEST_UCT_MD_NAME");
std::string md_name = (str != NULL) ? str : "";

std::vector<test_md_param> result;
for (std::vector<md_resource>::iterator iter = md_resources.begin();
iter != md_resources.end(); ++iter) {
if (iter->cmpt_attr.name == cmpt_name) {
if ((iter->cmpt_attr.name == cmpt_name) &&
((md_name == "") || (md_name == iter->rsc_desc.md_name))) {
result.push_back(test_md_param());
result.back().component = iter->cmpt;
result.back().md_name = iter->rsc_desc.md_name;
Expand Down
11 changes: 11 additions & 0 deletions test/gtest/uct/uct_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,8 @@ void uct_test::set_cm_resources(std::vector<resource>& all_resources)
std::vector<const resource*> uct_test::enum_resources(const std::string& tl_name)
{
static bool tcp_fastest_dev = (getenv("GTEST_UCT_TCP_FASTEST_DEV") != NULL);
static const char *str = getenv("GTEST_UCT_RSC_NAME");
std::string dev_name = (str != NULL) ? str : "";
static std::vector<resource> all_resources;

if (all_resources.empty()) {
Expand Down Expand Up @@ -429,6 +431,11 @@ std::vector<const resource*> uct_test::enum_resources(const std::string& tl_name
resource_speed tcp_fastest_rsc;

for (unsigned j = 0; j < num_tl_resources; ++j) {
if ((dev_name != "") &&
(tl_resources[j].dev_name != dev_name)) {
continue;
}

if (tcp_fastest_dev && (std::string("tcp") ==
tl_resources[j].tl_name)) {
resource_speed rsc(iter->cmpt, iter->cmpt_attr, worker, md,
Expand Down Expand Up @@ -461,6 +468,10 @@ std::vector<const resource*> uct_test::enum_resources(const std::string& tl_name
ucs_async_context_destroy(async);
}

if (all_resources.size() == 0) {
UCS_TEST_ABORT("Could not add any resource");
}

return filter_resources(all_resources, resource::is_equal_tl_name, tl_name);
}

Expand Down

0 comments on commit cee33df

Please sign in to comment.