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

Commit 57bb313b authored by Dan Shi's avatar Dan Shi Committed by android-build-merger
Browse files

Merge "Add test config to minadbd_test" am: df1a5855 

am: b8f33fdf

Change-Id: Ifa25165e3b03d49cfb4b5e6b0af14e1059837022
parents e404f5d9 b8f33fdf

minadbd/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ include $(CLEAR_VARS) 


LOCAL_CLANG := true

LOCAL_MODULE := minadbd_test

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_SRC_FILES := fuse_adb_provider_test.cpp

LOCAL_CFLAGS := $(minadbd_cflags)

LOCAL_C_INCLUDES := $(LOCAL_PATH) system/core/adb

minadbd/AndroidTest.xml

0 → 100644
+26 −0
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 minadbd_test">

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

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

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

    </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="minadbd_test" />

    </test>

</configuration>
 
 No newline at end of file

tests/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ LOCAL_PATH := $(call my-dir) 
include $(CLEAR_VARS)

LOCAL_CFLAGS := -Werror

LOCAL_MODULE := recovery_unit_test

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_STATIC_LIBRARIES := \

    libverifier \
@@ -87,6 +88,7 @@ LOCAL_CFLAGS := \ 


LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_MODULE := recovery_component_test

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_C_INCLUDES := bootable/recovery

LOCAL_SRC_FILES := \

    component/applypatch_test.cpp \

tests/AndroidTest.xml

0 → 100644
+31 −0
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 recovery_component_test and recovery_unit_test">

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

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

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

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

    </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="recovery_component_test" />

    </test>

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

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

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

    </test>

</configuration>