diff options
| author | 2019-09-13 19:02:46 +0000 | |
|---|---|---|
| committer | 2019-09-13 19:06:30 +0000 | |
| commit | 5ea6971a1d8db38283549b3562f1d05e4b35ed03 (patch) | |
| tree | e2f79184c2b849c141edaaf71609b8d24cbcb82a | |
| parent | 068d101077cad7ca1ba4ddaa3f20a123c4495a8f (diff) | |
Revert "Build: Fix test data no present in test suite zip files."
This reverts commit 068d101077cad7ca1ba4ddaa3f20a123c4495a8f.
Reason for revert: Caused a regression
Test: Added data to a sh_test and compared before vs after
Fixes: 140761783
Change-Id: Ied6427cb2dc3093fb88632eb8f337c2b76e86b95
| -rw-r--r-- | core/base_rules.mk | 13 | ||||
| -rw-r--r-- | core/definitions.mk | 10 |
2 files changed, 23 insertions, 0 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index f1c5443274..b0e0577a2e 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -710,6 +710,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))) \ @@ -719,6 +731,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 diff --git a/core/definitions.mk b/core/definitions.mk index 431231d844..343afff5aa 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2417,6 +2417,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 |