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

Commit 1033ce1b authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "binderRpcTest: host requires vsock loopback" am: 1ff12cff am:... 

Merge "binderRpcTest: host requires vsock loopback" am: 1ff12cff am: 55609145 am: 0af57cf3 am: c9a80b2d am: b088406e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2593125



Change-Id: I13fad099e2374f25af9cfac0a8d5c37e435c2f3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5292f6fb b088406e

libs/binder/tests/binderRpcTest.cpp

+9 −1
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ INSTANTIATE_TEST_CASE_P(Trusty, BinderRpc, 
                                           ::testing::Values(true), ::testing::Values(true)),

                        BinderRpc::PrintParamInfo);

#else // BINDER_RPC_TO_TRUSTY_TEST

static bool testSupportVsockLoopback() {

bool testSupportVsockLoopback() {

    // We don't need to enable TLS to know if vsock is supported.

    unsigned int vsockPort = allocateVsockPort();
@@ -1225,7 +1225,15 @@ static std::vector<SocketType> testSocketTypes(bool hasPreconnected = true) { 


    if (hasPreconnected) ret.push_back(SocketType::PRECONNECTED);



#ifdef __BIONIC__

    // Devices may not have vsock support. AVF tests will verify whether they do, but

    // we can't require it due to old kernels for the time being.

    static bool hasVsockLoopback = testSupportVsockLoopback();

#else

    // On host machines, we always assume we have vsock loopback. If we don't, the

    // subsequent failures will be more clear than showing one now.

    static bool hasVsockLoopback = true;

#endif



    if (hasVsockLoopback) {

        ret.push_back(SocketType::VSOCK);

libs/binder/tests/binderRpcTestService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ int main(int argc, char* argv[]) { 
            CHECK_EQ(OK, server->setupRawSocketServer(std::move(socketFd)));

            break;

        case SocketType::VSOCK:

            CHECK_EQ(OK, server->setupVsockServer(VMADDR_CID_LOCAL, serverConfig.vsockPort));

            CHECK_EQ(OK, server->setupVsockServer(VMADDR_CID_LOCAL, serverConfig.vsockPort))

                    << "Need `sudo modprobe vsock_loopback`?";

            break;

        case SocketType::INET: {

            CHECK_EQ(OK, server->setupInetServer(kLocalInetAddress, 0, &outPort));