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

Commit 55a4615e authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libbinder: tests w/o '-Wno-*'" am: 06b12007 

am: fd8a2755

Change-Id: I11e34bf45b788b696b82ccf23dc86e97d0637e8c
parents e2ce3a11 fd8a2755

libs/binder/tests/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ cc_defaults { 
    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-unused-private-field",

        "-Wno-unused-variable",

    ],

}

libs/binder/tests/binderDriverInterfaceTest.cpp

+0 −1
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ TEST_F(BinderDriverInterfaceTest, IncRefsAcquireReleaseDecRefs) { 
}



TEST_F(BinderDriverInterfaceTest, Transaction) {

    binder_uintptr_t cookie = 1234;

    struct {

        uint32_t cmd1;

        struct binder_transaction_data arg1;

libs/binder/tests/binderLibTest.cpp

+1 −5
Original line number Diff line number Diff line
@@ -1083,7 +1083,6 @@ class BinderLibTestService : public BBinder 
            case BINDER_LIB_TEST_ADD_POLL_SERVER:

            case BINDER_LIB_TEST_ADD_SERVER: {

                int ret;

                uint8_t buf[1] = { 0 };

                int serverid;



                if (m_id != 0) {
@@ -1346,7 +1345,6 @@ class BinderLibTestService : public BBinder 
        bool m_serverStartRequested;

        sp<IBinder> m_serverStarted;

        sp<IBinder> m_strongRef;

        bool m_callbackPending;

        sp<IBinder> m_callback;

};
@@ -1408,7 +1406,7 @@ int run_server(int index, int readypipefd, bool usePoll) 
              * We simulate a single-threaded process using the binder poll

              * interface; besides handling binder commands, it can also

              * issue outgoing transactions, by storing a callback in

              * m_callback and setting m_callbackPending.

              * m_callback.

              *

              * processPendingCall() will then issue that transaction.

              */
@@ -1435,8 +1433,6 @@ int run_server(int index, int readypipefd, bool usePoll) 
}



int main(int argc, char **argv) {

    int ret;



    if (argc == 4 && !strcmp(argv[1], "--servername")) {

        binderservername = argv[2];

    } else {

libs/binder/tests/binderSafeInterfaceTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public: 


private:

    int32_t mValue = 0;

    uint8_t mPadding[4] = {}; // Avoids a warning from -Wpadded

    __attribute__((unused)) uint8_t mPadding[4] = {}; // Avoids a warning from -Wpadded

};



struct TestFlattenable : Flattenable<TestFlattenable> {
@@ -743,6 +743,7 @@ TEST_F(SafeInterfaceTest, TestIncremementParcelableVector) { 
    const std::vector<TestParcelable> a{TestParcelable{1}, TestParcelable{2}};

    std::vector<TestParcelable> aPlusOne;

    status_t result = mSafeInterfaceTest->increment(a, &aPlusOne);

    ASSERT_EQ(NO_ERROR, result);

    ASSERT_EQ(a.size(), aPlusOne.size());

    for (size_t i = 0; i < a.size(); ++i) {

        ASSERT_EQ(a[i].getValue() + 1, aPlusOne[i].getValue());

libs/binder/tests/schd-dbg.cpp

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ static void* thread_start(void* p) { 


  sta = tickNow();

  status_t ret = workers[target]->transact(BINDER_NOP, data, &reply);

  ASSERT(ret == NO_ERROR);

  end = tickNow();

  results_fifo->add_time(tickNano(sta, end));