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

Commit 99c6ca2d authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Merge "Accept EAGAIN on a binder transaction." am: 2b23a559 

am: f0745d15

Change-Id: I38ab5a6ce1400b0acf7c2445891195ce7a8d4ab8
parents 9afc7302 f0745d15

libs/binder/tests/binderDriverInterfaceTest.cpp

+11 −1
Original line number Diff line number Diff line
@@ -77,6 +77,16 @@ class BinderDriverInterfaceTest : public ::testing::Test { 
        virtual void TearDown() {

        }

    protected:

        /* The ioctl must either return 0, or if it doesn't errno should be accepted_errno */

        void binderTestIoctlSuccessOrError(int cmd, void *arg, int accepted_errno) {

            int ret;



            ret = ioctl(m_binderFd, cmd, arg);

            if (ret != 0) {

                EXPECT_EQ(errno, accepted_errno);

            }

        }



        void binderTestIoctlRetErr2(int cmd, void *arg, int expect_ret, int expect_errno, int accept_errno) {

            int ret;
@@ -256,7 +266,7 @@ TEST_F(BinderDriverInterfaceTest, Transaction) { 


    {

        SCOPED_TRACE("1st WriteRead");

        binderTestIoctl(BINDER_WRITE_READ, &bwr);

        binderTestIoctlSuccessOrError(BINDER_WRITE_READ, &bwr, EAGAIN);

    }

    EXPECT_EQ(sizeof(bc1), bwr.write_consumed);

    if (bwr.read_consumed < offsetof(typeof(br), pad)) {