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

Commit 331c67ef authored by Andrei Homescu's avatar Andrei Homescu
Browse files

libbinder: Disable the experimental version for binderRpcToTrustyTest 

Disable the experimental wire format version for the
Android-Trusty test since Trusty services only support
the stable versions.

Bug: 230135749
Test: Run binderRpcToTrustyTest manually
Change-Id: I385a945ac0a4d853b0b126aea4f27d398c44c9c9
parent ca2def9b

libs/binder/tests/binderRpcTestCommon.h

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,12 @@ static inline std::vector<RpcSecurity> RpcSecurityValues() { 
}



static inline bool hasExperimentalRpc() {

#ifdef BINDER_RPC_TO_TRUSTY_TEST

    // Trusty services do not support the experimental version,

    // so that we can update the prebuilts separately.

    // This covers the binderRpcToTrustyTest case on Android.

    return false;

#endif

#ifdef __ANDROID__

    return base::GetProperty("ro.build.version.codename", "") != "REL";

#else

libs/binder/tests/binderRpcUniversalTests.cpp

+2 −0
Original line number Diff line number Diff line
@@ -48,11 +48,13 @@ TEST(BinderRpc, CannotUseNextWireVersion) { 
    EXPECT_FALSE(session->setProtocolVersion(RPC_WIRE_PROTOCOL_VERSION_NEXT + 15));

}



#ifndef BINDER_RPC_TO_TRUSTY_TEST

TEST(BinderRpc, CanUseExperimentalWireVersion) {

    auto session = RpcSession::make();

    EXPECT_EQ(hasExperimentalRpc(),

              session->setProtocolVersion(RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL));

}

#endif



TEST_P(BinderRpc, Ping) {

    auto proc = createRpcTestSocketServerProcess({});