diff --git a/audio/aidl/vts/VtsHalDownmixTargetTest.cpp b/audio/aidl/vts/VtsHalDownmixTargetTest.cpp index 2272e921a9..b82bde114b 100644 --- a/audio/aidl/vts/VtsHalDownmixTargetTest.cpp +++ b/audio/aidl/vts/VtsHalDownmixTargetTest.cpp @@ -32,6 +32,9 @@ using aidl::android::hardware::audio::effect::Parameter; using android::audio_utils::channels::ChannelMix; using android::hardware::audio::common::testing::detail::TestExecutionTracer; +// minimal HAL interface version to run downmix data path test +constexpr int32_t kMinDataTestHalVersion = 2; + // Testing for enum values static const std::vector kTypeValues = {ndk::enum_range().begin(), ndk::enum_range().end()}; @@ -228,6 +231,10 @@ class DownmixFoldDataTest : public ::testing::TestWithParamgetInterfaceVersion(&version).isOk() && version < kMinDataTestHalVersion) { + GTEST_SKIP() << "Skipping the data test for version: " << version << "\n"; + } if (!isLayoutValid(mInputChannelLayout)) { GTEST_SKIP() << "Layout not supported \n"; } @@ -375,6 +382,10 @@ class DownmixStripDataTest : public ::testing::TestWithParamgetInterfaceVersion(&version).isOk() && version < kMinDataTestHalVersion) { + GTEST_SKIP() << "Skipping the data test for version: " << version << "\n"; + } if (!isLayoutValid(mInputChannelLayout)) { GTEST_SKIP() << "Layout not supported \n"; } @@ -418,7 +429,7 @@ INSTANTIATE_TEST_SUITE_P( [](const testing::TestParamInfo& info) { auto descriptor = std::get(info.param).second; std::string type = std::to_string(static_cast(std::get(info.param))); - std::string name = getPrefix(descriptor) + "_type" + type; + std::string name = getPrefix(descriptor) + "_type_" + type; std::replace_if( name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); return name; @@ -434,7 +445,7 @@ INSTANTIATE_TEST_SUITE_P( [](const testing::TestParamInfo& info) { auto descriptor = std::get(info.param).second; std::string layout = std::to_string(std::get(info.param)); - std::string name = getPrefix(descriptor) + "_fold" + "_layout" + layout; + std::string name = getPrefix(descriptor) + "_fold_layout_" + layout; std::replace_if( name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); return name; @@ -451,7 +462,7 @@ INSTANTIATE_TEST_SUITE_P( auto descriptor = std::get(info.param).second; std::string layout = std::to_string(static_cast(std::get(info.param))); - std::string name = getPrefix(descriptor) + "_strip" + "_layout" + layout; + std::string name = getPrefix(descriptor) + "_strip_layout_" + layout; std::replace_if( name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); return name;