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

Commit 86f441d8 authored by yangbill's avatar yangbill
Browse files

ATest: Sync auto_test_config for multilib modules 

auto_test_config will only be set once for the same
$(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)
ATest should also treat the multilib variant modules as testable.

Fix auto_generated config may have chance to be set as 2nd_arch name

BUG: 111397357
BUG: 110820867
BUG: 80298359

Test: . build/envseup.sh
      lunch aosp_x86_64-eng
      make -j out/target/product/generic_x86_64/module-info.json
      (check module-info.json for hello_world_test)
      make -j hello_world_test
      cat out/target/product/generic_x86_64/testcases/hello_world_test/hello_world_test.config

Change-Id: I69895b6373476c0053f2c6e657770d606ccfbcd1
parent 6ac13c77

core/autogen_test_config.mk

+3 −1
Original line number Diff line number Diff line
@@ -29,9 +29,10 @@ else 
autogen_test_config_template := $(NATIVE_TEST_CONFIG_TEMPLATE)

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)

	@echo "Auto generating test config $(notdir $@)"

	$(hide) sed 's&{MODULE}&$(PRIVATE_MODULE)&g' $< > $@

	$(hide) sed 's&{MODULE}&$(PRIVATE_MODULE_NAME)&g' $< > $@

my_auto_generate_config := true

else

# Auto generating test config file for instrumentation test
@@ -52,6 +53,7 @@ ifeq (true,$(my_auto_generate_config)) 
  LOCAL_INTERMEDIATE_TARGETS += $(autogen_test_config_file)

  $(LOCAL_BUILT_MODULE): $(autogen_test_config_file)

  ALL_MODULES.$(my_register_name).auto_test_config := true

  $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_autogen := true

else

  autogen_test_config_file :=

endif

core/base_rules.mk

+58 −53
Original line number Diff line number Diff line
@@ -566,10 +566,15 @@ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ 
    $(LOCAL_BUILT_MODULE):$(dir)/$(my_installed_module_stem))) \

  $(eval my_compat_dist_config_$(suite) := ))





# Make sure we only add the files once for multilib modules.

ifndef $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files

ifdef $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files

  # Sync the auto_test_config value for multilib modules.

  ifdef $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_autogen

    ALL_MODULES.$(my_register_name).auto_test_config := true

  endif

else

  $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files := true



  # LOCAL_COMPATIBILITY_SUPPORT_FILES is a list of <src>[:<dest>].

  $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

    $(eval my_compat_dist_$(suite) += $(foreach f, $(LOCAL_COMPATIBILITY_SUPPORT_FILES), \