Audio VTS: Fix empty parameter list failures for AudioV6 am: 1eb1f36877

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1382482

Change-Id: I1d6209089706af3b44d2578c055087b0b8d0dd06
This commit is contained in:
Jasmine Cha
2020-08-03 20:08:45 +00:00
committed by Automerger Merge Worker

View File

@@ -729,7 +729,6 @@ INSTANTIATE_TEST_CASE_P(
::testing::ValuesIn(ConfigHelper::getRecommendedSupportCaptureAudioConfig()), ::testing::ValuesIn(ConfigHelper::getRecommendedSupportCaptureAudioConfig()),
::testing::Values(AudioInputFlag::NONE)), ::testing::Values(AudioInputFlag::NONE)),
&DeviceConfigParameterToString); &DeviceConfigParameterToString);
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OptionalInputBufferSizeTest);
#elif MAJOR_VERSION >= 6 #elif MAJOR_VERSION >= 6
INSTANTIATE_TEST_CASE_P(SupportedInputBufferSize, RequiredInputBufferSizeTest, INSTANTIATE_TEST_CASE_P(SupportedInputBufferSize, RequiredInputBufferSizeTest,
::testing::ValuesIn(getInputDeviceConfigParameters()), ::testing::ValuesIn(getInputDeviceConfigParameters()),
@@ -737,6 +736,7 @@ INSTANTIATE_TEST_CASE_P(SupportedInputBufferSize, RequiredInputBufferSizeTest,
#endif #endif
// When the VTS test runs on a device lacking the corresponding HAL version the parameter // When the VTS test runs on a device lacking the corresponding HAL version the parameter
// list is empty, this isn't a problem. // list is empty, this isn't a problem.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OptionalInputBufferSizeTest);
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(RequiredInputBufferSizeTest); GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(RequiredInputBufferSizeTest);
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////