From f0dfc4d6245a82d231164d653b76a5574e513d20 Mon Sep 17 00:00:00 2001 From: David Su Date: Fri, 24 Jul 2020 18:46:33 +0000 Subject: [PATCH] Revert "Add Tuner HAL and TvInput HAL VTS tests into the exception list of the uninstantiated" This reverts commit 0857d7caa060d5390593136448c44df34db8df6d. Reason for revert: breaks build: b/162086397 Change-Id: If91c59aa5485cd78e42b743a7bf786c68283aecb --- .../1.0/vts/functional/VtsHalTvInputV1_0TargetTest.cpp | 3 --- .../1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/tv/input/1.0/vts/functional/VtsHalTvInputV1_0TargetTest.cpp b/tv/input/1.0/vts/functional/VtsHalTvInputV1_0TargetTest.cpp index 8092d5e7d2..59c70eb1e2 100644 --- a/tv/input/1.0/vts/functional/VtsHalTvInputV1_0TargetTest.cpp +++ b/tv/input/1.0/vts/functional/VtsHalTvInputV1_0TargetTest.cpp @@ -337,6 +337,3 @@ INSTANTIATE_TEST_SUITE_P( PerInstance, TvInputHidlTest, testing::ValuesIn(android::hardware::getAllHalInstanceNames(ITvInput::descriptor)), android::hardware::PrintInstanceNameToString); - -// TODO remove from the allow list once the cf tv target is enabled for testing -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TvInputHidlTest); diff --git a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp index 4f6c19ed59..2be68b8fc0 100644 --- a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp +++ b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp @@ -572,14 +572,4 @@ INSTANTIATE_TEST_SUITE_P( PerInstance, TunerDescramblerHidlTest, testing::ValuesIn(android::hardware::getAllHalInstanceNames(ITuner::descriptor)), android::hardware::PrintInstanceNameToString); - -// TODO remove from the allow list once the cf tv target is enabled for testing -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerFrontendHidlTest); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerLnbHidlTest); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerDemuxHidlTest); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerFilterHidlTest); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerBroadcastHidlTest); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerPlaybackHidlTest); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerRecordHidlTest); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerDescramblerHidlTest); } // namespace