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

Commit 50313490 authored by yangbill's avatar yangbill Committed by android-build-merger
Browse files

Merge "ATest: Host native test config auto-gen support." am: 56d08ec8 am: 7edbae73 

am: 1fa25cdd

Change-Id: Ic286ffddbeffc6a3beef766db628b7e216d14a06
parents 140839b1 1fa25cdd

core/autogen_test_config.mk

+5 −1
Original line number Diff line number Diff line
@@ -25,9 +25,13 @@ autogen_test_config_file := $(dir $(LOCAL_BUILT_MODULE))$(LOCAL_MODULE).config 
ifeq (true,$(is_native))

ifeq ($(LOCAL_NATIVE_BENCHMARK),true)

autogen_test_config_template := $(NATIVE_BENCHMARK_TEST_CONFIG_TEMPLATE)

else

  ifeq ($(LOCAL_IS_HOST_MODULE),true)

    autogen_test_config_template := $(NATIVE_HOST_TEST_CONFIG_TEMPLATE)

  else

    autogen_test_config_template := $(NATIVE_TEST_CONFIG_TEMPLATE)

  endif

endif

# Auto generating test config file for native test

$(autogen_test_config_file): PRIVATE_MODULE_NAME := $(LOCAL_MODULE)

$(autogen_test_config_file) : $(autogen_test_config_template)

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ INSTRUMENTATION_TEST_CONFIG_TEMPLATE := $(BUILD_SYSTEM)/instrumentation_test_con 
NATIVE_BENCHMARK_TEST_CONFIG_TEMPLATE := $(BUILD_SYSTEM)/native_benchmark_test_config_template.xml

NATIVE_TEST_CONFIG_TEMPLATE := $(BUILD_SYSTEM)/native_test_config_template.xml

EMPTY_TEST_CONFIG := $(BUILD_SYSTEM)/empty_test_config.xml

NATIVE_HOST_TEST_CONFIG_TEMPLATE := $(BUILD_SYSTEM)/native_host_test_config_template.xml



# Tool to generate TradeFed test config file automatically.

AUTOGEN_TEST_CONFIG_SCRIPT := build/make/tools/auto_gen_test_config.py

core/native_host_test_config_template.xml

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

<!-- Copyright (C) 2018 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.

-->

<!-- This test config file is auto-generated. -->

<configuration description="Runs {MODULE}.">

    <option name="null-device" value="true" />

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

        <option name="module-name" value="{MODULE}" />

    </test>

</configuration>