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

Commit f06dc6d7 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "lshal: resistent to metaversion updates." am: 3f21eafa am: e3ce3430... 

Merge "lshal: resistent to metaversion updates." am: 3f21eafa am: e3ce3430 am: 669dcbb0 am: 455b7a5b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1461294

Change-Id: I695553bc9a351c81f55487bc6fdb84b7c2b60c34
parents 2dd1a2d0 455b7a5b

cmds/lshal/test.cpp

+2 −4
Original line number Diff line number Diff line
@@ -479,8 +479,7 @@ TEST_F(ListTest, Fetch) { 
}



TEST_F(ListTest, DumpVintf) {

    const std::string expected = "<manifest version=\"2.0\" type=\"device\">\n"

                                 "    <hal format=\"hidl\">\n"

    const std::string expected = "    <hal format=\"hidl\">\n"

                                 "        <name>a.h.foo1</name>\n"

                                 "        <transport>hwbinder</transport>\n"

                                 "        <fqname>@1.0::IFoo/1</fqname>\n"
@@ -499,8 +498,7 @@ TEST_F(ListTest, DumpVintf) { 
                                 "        <name>a.h.foo4</name>\n"

                                 "        <transport arch=\"32\">passthrough</transport>\n"

                                 "        <fqname>@4.0::IFoo/4</fqname>\n"

                                 "    </hal>\n"

                                 "</manifest>";

                                 "    </hal>\n";



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

    EXPECT_EQ(0u, mockList->main(createArg({"lshal", "--init-vintf"})));