commit 7ce78b0a476193d0ffb394fe0d876efcdcd9290b
author Martijn Coenen <maco@google.com> Wed Dec 13 03:10:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 13 03:10:47 2017 +0000
tree 8abbee2ac9823ef34c1a738564e274e153c0133c
parent a8b82b5af12fab347be9275cca19781505255f17
parent 99c6ca2da04782f66ab75ecb58a11d1e468412ce

Merge "Accept EAGAIN on a binder transaction." am: 2b23a55901 am: f0745d15ea
am: 99c6ca2da0

Change-Id: Ie8c02c7ac4e4836972ce5ce167112f2718ad8add

libs/binder/tests/binderDriverInterfaceTest.cpp

diff --git a/libs/binder/tests/binderDriverInterfaceTest.cpp b/libs/binder/tests/binderDriverInterfaceTest.cpp
index b14631d..4f00bc1 100644
--- a/libs/binder/tests/binderDriverInterfaceTest.cpp
+++ b/libs/binder/tests/binderDriverInterfaceTest.cpp
@@ -77,6 +77,16 @@
         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 @@
 
     {
         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)) {