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

Commit 4da63dd9 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Fix lshal_test after updated defaults." am: 0ba6a437 

am: be4a5859

Change-Id: I941740a0aab67ab07131291401ca145e9522c847
parents c86c0440 be4a5859

cmds/lshal/Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -72,14 +72,18 @@ cc_binary { 


cc_test {

    name: "lshal_test",

    test_suites: ["device-tests"],

    defaults: ["lshal_defaults"],

    gtest: true,

    static_libs: [

        "libgmock"

        "android.hardware.tests.baz@1.0",

        "libgmock",

    ],

    shared_libs: [

        "libhwbinder",

        "libhidlbase",

        "libhidltransport",

        "libvintf",

        "android.hardware.tests.baz@1.0"

    ],

    srcs: [

        "test.cpp"

cmds/lshal/TEST_MAPPING

0 → 100644
+8 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "lshal_test"

    }

  ]

}

cmds/lshal/test.cpp

+9 −9
Original line number Diff line number Diff line
@@ -493,19 +493,19 @@ TEST_F(ListTest, DumpVintf) { 
TEST_F(ListTest, DumpDefault) {

    const std::string expected =

        "[fake description 0]\n"

        "R Interface            Thread Use Server Clients\n"

        "N a.h.foo1@1.0::IFoo/1 11/21      1      2 4\n"

        "Y a.h.foo2@2.0::IFoo/2 12/22      2      3 5\n"

        "VINTF R Interface            Thread Use Server Clients\n"

        "X     N a.h.foo1@1.0::IFoo/1 11/21      1      2 4\n"

        "X     Y a.h.foo2@2.0::IFoo/2 12/22      2      3 5\n"

        "\n"

        "[fake description 1]\n"

        "R Interface            Thread Use Server Clients\n"

        "? a.h.foo3@3.0::IFoo/3 N/A        N/A    4 6\n"

        "? a.h.foo4@4.0::IFoo/4 N/A        N/A    5 7\n"

        "VINTF R Interface            Thread Use Server Clients\n"

        "X     ? a.h.foo3@3.0::IFoo/3 N/A        N/A    4 6\n"

        "X     ? a.h.foo4@4.0::IFoo/4 N/A        N/A    5 7\n"

        "\n"

        "[fake description 2]\n"

        "R Interface            Thread Use Server Clients\n"

        "? a.h.foo5@5.0::IFoo/5 N/A        N/A    6 8\n"

        "? a.h.foo6@6.0::IFoo/6 N/A        N/A    7 9\n"

        "VINTF R Interface            Thread Use Server Clients\n"

        "X     ? a.h.foo5@5.0::IFoo/5 N/A        N/A    6 8\n"

        "X     ? a.h.foo6@6.0::IFoo/6 N/A        N/A    7 9\n"

        "\n";



    optind = 1; // mimic Lshal::parseArg()