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

Commit 4f48cad7 authored by Ziwei Zhang's avatar Ziwei Zhang Committed by Automerger Merge Worker
Browse files

Merge "Generate 2.0 config for Mobly test." into main am: a8de90ce am: 77d1f60f 

Original change: https://android-review.googlesource.com/c/platform/build/+/2943045



Change-Id: I738337f359be6b7ed9084ed9b4051d8ed71deeb4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e3858d8 77d1f60f

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ else 
  ifneq (,$(test_config))

    $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

      $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

        $(test_config):$(dir)/$(LOCAL_MODULE).config)))

        $(test_config):$(dir)/$(LOCAL_MODULE).config$(LOCAL_TEST_CONFIG_SUFFIX))))

  endif



  ifneq (,$(LOCAL_EXTRA_FULL_TEST_CONFIGS))

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ LOCAL_STRIP_MODULE:= 
LOCAL_SYSTEM_SHARED_LIBRARIES:=none

LOCAL_TARGET_REQUIRED_MODULES:=

LOCAL_TEST_CONFIG:=

LOCAL_TEST_CONFIG_SUFFIX:=

LOCAL_TEST_DATA:=

LOCAL_TEST_DATA_BINS:=

LOCAL_TEST_MAINLINE_MODULES:=

core/python_binary_host_mobly_test_config_template.xml

+4 −8
Original line number Diff line number Diff line
@@ -13,13 +13,9 @@ 
<configuration description="Config for {MODULE} mobly test">

    {EXTRA_CONFIGS}



    <device name="device1"></device>

    <device name="device2"></device>

    <device name="AndroidRealDevice"></device>

    <device name="AndroidRealDevice"></device>



    <test class="com.android.tradefed.testtype.mobly.MoblyBinaryHostTest">

      <!-- The mobly-par-file-name should match the module name -->

      <option name="mobly-par-file-name" value="{MODULE}" />

      <!-- Timeout limit in milliseconds for all test cases of the python binary -->

      <option name="mobly-test-timeout" value="300000" />

    </test>

    <option name="mobly_pkg" key="file" value="{MODULE}" />

    <test class="MoblyAospPackageTest" />

</configuration>