commit 1f6d034b5c5c24c8a377b82fb328789b4bb743f7
author Sam Saccone <samccone@google.com> Mon Jan 30 15:36:01 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 30 15:36:01 2023 +0000
tree f0bca0d8da3a13ec5d84a03211e34f562f391840
parent 94675e7b820e290053ba5a1f225211fadff4e6c6

Revert "libbinder: Build and run binderRpcTest on Trusty"

This reverts commit 94675e7b820e290053ba5a1f225211fadff4e6c6.

Reason for revert: b/267116767

Change-Id: I9821d7124fdd1d21c581e28196a0c2b6a033b726

libs/binder/tests/binderRpcUniversalTests.cpp

diff --git a/libs/binder/tests/binderRpcUniversalTests.cpp b/libs/binder/tests/binderRpcUniversalTests.cpp
index 11a22b0..2249e5c 100644
--- a/libs/binder/tests/binderRpcUniversalTests.cpp
+++ b/libs/binder/tests/binderRpcUniversalTests.cpp
@@ -386,11 +386,11 @@
     EXPECT_EQ(b, weak.promote());
 }
 
-#define EXPECT_SESSIONS(expected, iface)                  \
+#define expectSessions(expected, iface)                   \
     do {                                                  \
         int session;                                      \
         EXPECT_OK((iface)->getNumOpenSessions(&session)); \
-        EXPECT_EQ(static_cast<int>(expected), session);   \
+        EXPECT_EQ(expected, session);                     \
     } while (false)
 
 TEST_P(BinderRpc, SingleSession) {
@@ -402,9 +402,9 @@
     EXPECT_OK(session->getName(&out));
     EXPECT_EQ("aoeu", out);
 
-    EXPECT_SESSIONS(1, proc.rootIface);
+    expectSessions(1, proc.rootIface);
     session = nullptr;
-    EXPECT_SESSIONS(0, proc.rootIface);
+    expectSessions(0, proc.rootIface);
 }
 
 TEST_P(BinderRpc, ManySessions) {
@@ -413,24 +413,24 @@
     std::vector<sp<IBinderRpcSession>> sessions;
 
     for (size_t i = 0; i < 15; i++) {
-        EXPECT_SESSIONS(i, proc.rootIface);
+        expectSessions(i, proc.rootIface);
         sp<IBinderRpcSession> session;
         EXPECT_OK(proc.rootIface->openSession(std::to_string(i), &session));
         sessions.push_back(session);
     }
-    EXPECT_SESSIONS(sessions.size(), proc.rootIface);
+    expectSessions(sessions.size(), proc.rootIface);
     for (size_t i = 0; i < sessions.size(); i++) {
         std::string out;
         EXPECT_OK(sessions.at(i)->getName(&out));
         EXPECT_EQ(std::to_string(i), out);
     }
-    EXPECT_SESSIONS(sessions.size(), proc.rootIface);
+    expectSessions(sessions.size(), proc.rootIface);
 
     while (!sessions.empty()) {
         sessions.pop_back();
-        EXPECT_SESSIONS(sessions.size(), proc.rootIface);
+        expectSessions(sessions.size(), proc.rootIface);
     }
-    EXPECT_SESSIONS(0, proc.rootIface);
+    expectSessions(0, proc.rootIface);
 }
 
 TEST_P(BinderRpc, OnewayCallDoesNotWait) {
@@ -483,7 +483,7 @@
                     cb->mCv.wait_for(_l, 1s, [&] { return !cb->mValues.empty(); });
                 }
 
-                EXPECT_EQ(cb->mValues.size(), 1UL)
+                EXPECT_EQ(cb->mValues.size(), 1)
                         << "callIsOneway: " << callIsOneway
                         << " callbackIsOneway: " << callbackIsOneway << " delayed: " << delayed;
                 if (cb->mValues.empty()) continue;