Merge "Accept EAGAIN on a binder transaction." into oreo-mr1-vts-dev (72ea70f2) · Commits · e / os / android_frameworks_native

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;

		@@ -250,7 +260,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)) {