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

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

Change-Id: I7798e6c080a090459a646d9ee3013f3d101b5978
This commit is contained in:
Jasmine Cha 2020-08-03 20:33:06 +00:00 committed by Automerger Merge Worker
commit 58a2095cc0

View file

@ -739,7 +739,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()),
@ -747,6 +746,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);
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////