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

Commit a23f87c1 authored by Abhijeet Kaur's avatar Abhijeet Kaur Committed by android-build-merger
Browse files

Merge "Fix dumpstate_test test config" am: 57bf6a99 am: 57e287f2 am: c2d52cf9 

am: c7267dbc

Change-Id: I7d8eb15c58d77c3e92edcde57f883f627b85c4ac
parents 76e032ad c7267dbc

cmds/dumpstate/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ cc_test { 
        "tests/dumpstate_test.cpp",

    ],

    static_libs: ["libgmock"],

    test_config: "dumpstate_test.xml",

    data: [":dumpstate_test_fixture", "tests/testdata/**/*"]

}



cc_test {

cmds/dumpstate/dumpstate_test.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Config for dumpstate_test">

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="cleanup" value="true" />

        <option name="push" value="dumpstate_test->/data/local/tmp/dumpstate_test" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

    <option name="test-suite-tag" value="apct" />

    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="file-exclusion-filter-regex" value=".*/dumpstate_test_fixture" />

        <option name="file-exclusion-filter-regex" value=".*/tests/.*" />

        <option name="module-name" value="dumpstate_test" />

    </test>

</configuration>

cmds/dumpstate/tests/dumpstate_test.cpp

+2 −3
Original line number Diff line number Diff line
@@ -105,9 +105,8 @@ class DumpstateBaseTest : public Test { 


  protected:

    const std::string kTestPath = dirname(android::base::GetExecutablePath().c_str());

    const std::string kFixturesPath = kTestPath + "/../dumpstate_test_fixture/";

    const std::string kTestDataPath = kFixturesPath + "tests/testdata/";

    const std::string kSimpleCommand = kFixturesPath + "dumpstate_test_fixture";

    const std::string kTestDataPath = kTestPath + "/tests/testdata/";

    const std::string kSimpleCommand = kTestPath + "/dumpstate_test_fixture";

    const std::string kEchoCommand = "/system/bin/echo";



    /*