Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff985a85 authored by Dan Shi's avatar Dan Shi
Browse files

Suppress gtest error for tests without any instance 

Bug: 162052785
Test: m -j vts
Change-Id: I58bc808a82b2128bb8774f762f9b9fcecd2614fb
parent 9eaab747

automotive/audiocontrol/1.0/vts/functional/VtsHalAudioControlV1_0TargetTest.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -140,6 +140,7 @@ TEST_P(CarAudioControlHidlTest, ContextMapping) { 
    EXPECT_EQ(bus, -1);

    EXPECT_EQ(bus, -1);

}

}





GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CarAudioControlHidlTest);

INSTANTIATE_TEST_SUITE_P(

INSTANTIATE_TEST_SUITE_P(

        PerInstance, CarAudioControlHidlTest,

        PerInstance, CarAudioControlHidlTest,

        testing::ValuesIn(android::hardware::getAllHalInstanceNames(IAudioControl::descriptor)),

        testing::ValuesIn(android::hardware::getAllHalInstanceNames(IAudioControl::descriptor)),

automotive/audiocontrol/2.0/vts/functional/VtsHalAudioControlV2_0TargetTest.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -149,6 +149,7 @@ TEST_P(CarAudioControlHidlTest, FocusChangeExercise) { 
                                      AudioFocusChange::GAIN_TRANSIENT | 0);

                                      AudioFocusChange::GAIN_TRANSIENT | 0);

};

};





GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CarAudioControlHidlTest);

INSTANTIATE_TEST_SUITE_P(

INSTANTIATE_TEST_SUITE_P(

        PerInstance, CarAudioControlHidlTest,

        PerInstance, CarAudioControlHidlTest,

        testing::ValuesIn(android::hardware::getAllHalInstanceNames(IAudioControl::descriptor)),

        testing::ValuesIn(android::hardware::getAllHalInstanceNames(IAudioControl::descriptor)),

automotive/can/1.0/vts/functional/VtsHalCanBusV1_0TargetTest.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -176,8 +176,9 @@ TEST_P(CanBusHalTest, DontCloseErrorListener) { 
 * adb shell /data/nativetest64/VtsHalCanBusV1_0TargetTest/VtsHalCanBusV1_0TargetTest\

 * adb shell /data/nativetest64/VtsHalCanBusV1_0TargetTest/VtsHalCanBusV1_0TargetTest\

 *     --gtest_filter=*_<NAME_OF_VALID_BUS>

 *     --gtest_filter=*_<NAME_OF_VALID_BUS>

 */

 */

INSTANTIATE_TEST_SUITE_P(  //

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CanBusHalTest);

        PerInstance, CanBusHalTest, testing::ValuesIn(getAllHalInstanceNames(ICanBus::descriptor)),

INSTANTIATE_TEST_SUITE_P(PerInstance, CanBusHalTest,

                         testing::ValuesIn(getAllHalInstanceNames(ICanBus::descriptor)),

                         PrintInstanceNameToString);

                         PrintInstanceNameToString);





}  // namespace android::hardware::automotive::can::V1_0::vts
 
}  // namespace android::hardware::automotive::can::V1_0::vts

automotive/can/1.0/vts/functional/VtsHalCanBusVirtualV1_0TargetTest.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -868,8 +868,8 @@ TEST_P(CanBusVirtualHalTest, FilterMixed) { 
 * Example manual invocation:

 * Example manual invocation:

 * adb shell /data/nativetest64/VtsHalCanBusVirtualV1_0TargetTest/VtsHalCanBusVirtualV1_0TargetTest

 * adb shell /data/nativetest64/VtsHalCanBusVirtualV1_0TargetTest/VtsHalCanBusVirtualV1_0TargetTest

 */

 */

INSTANTIATE_TEST_SUITE_P(  //

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CanBusVirtualHalTest);

        PerInstance, CanBusVirtualHalTest,

INSTANTIATE_TEST_SUITE_P(PerInstance, CanBusVirtualHalTest,

                         testing::ValuesIn(getAllHalInstanceNames(ICanController::descriptor)),

                         testing::ValuesIn(getAllHalInstanceNames(ICanController::descriptor)),

                         PrintInstanceNameToString);

                         PrintInstanceNameToString);

automotive/can/1.0/vts/functional/VtsHalCanControllerV1_0TargetTest.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -293,8 +293,8 @@ TEST_P(CanControllerHalTest, FailBadSlcanAddress) { 
 * Example manual invocation:

 * Example manual invocation:

 * adb shell /data/nativetest64/VtsHalCanControllerV1_0TargetTest/VtsHalCanControllerV1_0TargetTest

 * adb shell /data/nativetest64/VtsHalCanControllerV1_0TargetTest/VtsHalCanControllerV1_0TargetTest

 */

 */

INSTANTIATE_TEST_SUITE_P(  //

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CanControllerHalTest);

        PerInstance, CanControllerHalTest,

INSTANTIATE_TEST_SUITE_P(PerInstance, CanControllerHalTest,

                         testing::ValuesIn(getAllHalInstanceNames(ICanController::descriptor)),

                         testing::ValuesIn(getAllHalInstanceNames(ICanController::descriptor)),

                         PrintInstanceNameToString);

                         PrintInstanceNameToString);