From ee38e26ab21f7eef45e78645cc9fb546881d967d Mon Sep 17 00:00:00 2001 From: gabrpham Date: Tue, 9 Sep 2025 14:32:01 -0500 Subject: [PATCH] [SWDEV_543709] Updated tests with new expectations for output (#692) Co-authored-by: Maisam Arif --- .../tests/rocm_smi_test/functional/fan_read.cc | 13 ++++++------- .../functional/perf_level_read_write.cc | 5 ++--- .../tests/rocm_smi_test/functional/temp_read.cc | 2 +- .../tests/rocm_smi_test/functional/volt_read.cc | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/projects/rocm-smi-lib/tests/rocm_smi_test/functional/fan_read.cc b/projects/rocm-smi-lib/tests/rocm_smi_test/functional/fan_read.cc index 612cfdbb00..19d534d9a5 100755 --- a/projects/rocm-smi-lib/tests/rocm_smi_test/functional/fan_read.cc +++ b/projects/rocm-smi-lib/tests/rocm_smi_test/functional/fan_read.cc @@ -102,14 +102,13 @@ void TestFanRead::Run(void) { std::cout << "\t**Current Fan Speed: "; } err = rsmi_dev_fan_speed_get(i, 0, &val_i64); - if (err == RSMI_STATUS_NOT_SUPPORTED) { - IF_VERB(STANDARD) { - std::cout << "\t**" << ": " << - "Not supported on this machine" << std::endl; - } - return; + if (err == RSMI_STATUS_NOT_SUPPORTED || err == RSMI_STATUS_UNEXPECTED_DATA) { + IF_VERB(STANDARD) { + std::cout << "\t** Not supported on this machine" << std::endl; + } + return; } else { - CHK_ERR_ASRT(err) + CHK_ERR_ASRT(err); } diff --git a/projects/rocm-smi-lib/tests/rocm_smi_test/functional/perf_level_read_write.cc b/projects/rocm-smi-lib/tests/rocm_smi_test/functional/perf_level_read_write.cc index 493c1e264f..85fae7462e 100755 --- a/projects/rocm-smi-lib/tests/rocm_smi_test/functional/perf_level_read_write.cc +++ b/projects/rocm-smi-lib/tests/rocm_smi_test/functional/perf_level_read_write.cc @@ -102,11 +102,10 @@ void TestPerfLevelReadWrite::Run(void) { PrintDeviceHeader(dv_ind); ret = rsmi_dev_perf_level_get(dv_ind, &orig_pfl); - if (ret == RSMI_STATUS_NOT_SUPPORTED) { + if (ret == RSMI_STATUS_NOT_SUPPORTED || ret == RSMI_STATUS_UNEXPECTED_DATA) { IF_VERB(STANDARD) { std::cout << "\t**rsmi_dev_perf_level_get(): Not supported on this machine" << std::endl; } - ASSERT_EQ(ret, RSMI_STATUS_NOT_SUPPORTED); continue; } @@ -128,7 +127,7 @@ void TestPerfLevelReadWrite::Run(void) { } ret = rsmi_dev_perf_level_set(dv_ind, static_cast(pfl_i)); - if (ret == RSMI_STATUS_NOT_SUPPORTED) { + if (ret == RSMI_STATUS_NOT_SUPPORTED || ret == RSMI_STATUS_UNEXPECTED_DATA) { std::cout << "\t**" << GetPerfLevelStr(static_cast(pfl_i)) << " returned RSMI_STATUS_NOT_SUPPORTED" << std::endl; } else { diff --git a/projects/rocm-smi-lib/tests/rocm_smi_test/functional/temp_read.cc b/projects/rocm-smi-lib/tests/rocm_smi_test/functional/temp_read.cc index 9226f82bde..5bd07d6f27 100755 --- a/projects/rocm-smi-lib/tests/rocm_smi_test/functional/temp_read.cc +++ b/projects/rocm-smi-lib/tests/rocm_smi_test/functional/temp_read.cc @@ -116,7 +116,7 @@ void TestTempRead::Run(void) { err = rsmi_dev_temp_metric_get(i, type, met, &val_i64); if (err != RSMI_STATUS_SUCCESS) { - if (err == RSMI_STATUS_NOT_SUPPORTED) { + if (err == RSMI_STATUS_NOT_SUPPORTED || err == RSMI_STATUS_UNEXPECTED_DATA) { IF_VERB(STANDARD) { std::cout << "\t**" << label << ": " << "Not supported on this machine" << std::endl; diff --git a/projects/rocm-smi-lib/tests/rocm_smi_test/functional/volt_read.cc b/projects/rocm-smi-lib/tests/rocm_smi_test/functional/volt_read.cc index 65a28658d3..23e414ca63 100644 --- a/projects/rocm-smi-lib/tests/rocm_smi_test/functional/volt_read.cc +++ b/projects/rocm-smi-lib/tests/rocm_smi_test/functional/volt_read.cc @@ -112,7 +112,7 @@ void TestVoltRead::Run(void) { err = rsmi_dev_volt_metric_get(i, type, met, &val_i64); if (err != RSMI_STATUS_SUCCESS) { - if (err == RSMI_STATUS_NOT_SUPPORTED) { + if (err == RSMI_STATUS_NOT_SUPPORTED || err == RSMI_STATUS_UNEXPECTED_DATA) { IF_VERB(STANDARD) { std::cout << "\t**" << label << ": " << "Not supported on this machine" << std::endl;