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

Commit 9f2e6800 authored by Jaewoong Jung's avatar Jaewoong Jung Committed by Gerrit Code Review
Browse files

Merge "Revert "Build: Fix test data no present in test suite zip files.""

parents 0b67e41f 5ea6971a

core/base_rules.mk

+13 −0
Original line number Diff line number Diff line
@@ -716,6 +716,18 @@ ifneq (,$(filter $(SOONG_OUT_DIR)%,$(LOCAL_FULL_TEST_CONFIG))) 
  endif

endif





ifeq ($(use_testcase_folder),true)

ifneq ($(my_test_data_file_pairs),)

$(foreach pair, $(my_test_data_file_pairs), \

  $(eval parts := $(subst :,$(space),$(pair))) \

  $(eval src_path := $(word 1,$(parts))) \

  $(eval file := $(word 2,$(parts))) \

  $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

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

      $(call filter-copy-pair,$(src_path),$(call append-path,$(dir),$(file)),$(my_installed_test_data))))))

endif

else

ifneq ($(my_test_data_file_pairs),)

$(foreach pair, $(my_test_data_file_pairs), \

  $(eval parts := $(subst :,$(space),$(pair))) \
@@ -725,6 +737,7 @@ $(foreach pair, $(my_test_data_file_pairs), \ 
    $(eval my_compat_dist_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \

      $(src_path):$(call append-path,$(dir),$(file))))))

endif

endif

core/definitions.mk

+10 −0
Original line number Diff line number Diff line
@@ -2419,6 +2419,16 @@ define compat-copy-pair 
$(if $(filter-out $(2), $(LOCAL_INSTALLED_MODULE)), $(1):$(2))

endef



# Create copy pair for $(1) $(2)

# If $(2) is substring of $(3) do nothing.

# $(1): source path

# $(2): destination path

# $(3): filter-out target

# The format of copy pair is src:dst

define filter-copy-pair

$(if $(findstring $(2), $(3)),,$(1):$(2))

endef



# Copies many files.

# $(1): The files to copy.  Each entry is a ':' separated src:dst pair

# $(2): An optional directory to prepend to the destination