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

Commit 2e749339 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Allow VTS of 1.0 tetheroffload to be optional"

parents b54aebc2 3db2f848

tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -469,7 +469,7 @@ TEST_P(OffloadControlTestV1_0_HalStarted, RemoveDownstreamBogusPrefixFails) { 
    }

    }

}

}





GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OffloadControlHidlTestBase);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OffloadControlTestV1_0_HalNotStarted);

INSTANTIATE_TEST_CASE_P(

INSTANTIATE_TEST_CASE_P(

        PerInstance, OffloadControlTestV1_0_HalNotStarted,

        PerInstance, OffloadControlTestV1_0_HalNotStarted,

        testing::Combine(testing::ValuesIn(android::hardware::getAllHalInstanceNames(

        testing::Combine(testing::ValuesIn(android::hardware::getAllHalInstanceNames(
@@ -478,7 +478,7 @@ INSTANTIATE_TEST_CASE_P( 
                                 IOffloadControl::descriptor))),

                                 IOffloadControl::descriptor))),

        android::hardware::PrintInstanceTupleNameToString<>);

        android::hardware::PrintInstanceTupleNameToString<>);





GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OffloadControlHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OffloadControlTestV1_0_HalStarted);

INSTANTIATE_TEST_CASE_P(

INSTANTIATE_TEST_CASE_P(

        PerInstance, OffloadControlTestV1_0_HalStarted,

        PerInstance, OffloadControlTestV1_0_HalStarted,

        testing::Combine(testing::ValuesIn(android::hardware::getAllHalInstanceNames(

        testing::Combine(testing::ValuesIn(android::hardware::getAllHalInstanceNames(