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

Commit 029d96fe authored by Julien Desprez's avatar Julien Desprez Committed by Automerger Merge Worker
Browse files

Merge "Update bootstat_test to really work host-side" am: e1ee7873 am: bc2ad2be 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1577763

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67e39e2c93e0d6093c0babe2f9bea74b9d9a5f05
parents c444bce2 bc2ad2be

bootstat/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -93,4 +93,7 @@ cc_test { 
        "boot_event_record_store_test.cpp",

        "testrunner.cpp",

    ],

    test_options: {

        unit_test: true,

    },

}

bootstat/AndroidTest.xml

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

<!-- Copyright (C) 2017 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 bootstat_tests">

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

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

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

    </target_preparer>

    <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="module-name" value="bootstat_tests" />

    </test>

</configuration>
 
 No newline at end of file