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

Commit 976c80ae authored by yangbill's avatar yangbill Committed by Colin Cross
Browse files

ATest: Host native test config auto-gen support. 

Autogenerate HostGTest test config for better user
experience of hostside native tests.

BUG: 80298359

Test: . build/envsetup.sh ; lunch aosp_x86_64-eng ; make -j
      . build/envsetup.sh ; lunch aosp_x86_64-eng ; make -j hello_world_test
      . build/envsetup.sh ; lunch aosp_x86_64-eng ; make -j CtsLiblogTestCases_list

Change-Id: Iee1db17f8957d3c1cd80c9aae1996a72b48413d9
parent c76b000a

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>