diff options
| author | 2019-07-04 23:29:47 +0800 | |
|---|---|---|
| committer | 2019-07-05 23:52:45 +0800 | |
| commit | 068d101077cad7ca1ba4ddaa3f20a123c4495a8f (patch) | |
| tree | f59a188ad2457437c941a3091794a662a9ed1770 | |
| parent | 28142690baa94cbe91aa19183de6a0666a7498b1 (diff) | |
Build: Fix test data no present in test suite zip files.
my_installed_test_data (LOCAL_TEST_DATA) no present in test
suite zip files for device tests
Bug: 135957483
Test: 1. Remove the patch aosp/1008195
2. m general-tests
3. unzip general-tests.zip
4. data files should exist in target/testcases/toybox-tests
Change-Id: I3f0a4d87e284c809625843d55dc5d35ef77e79bb
| -rw-r--r-- | core/base_rules.mk | 13 | ||||
| -rw-r--r-- | core/definitions.mk | 10 |
2 files changed, 0 insertions, 23 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index b0e0577a2e..f1c5443274 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -710,18 +710,6 @@ 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))) \ @@ -731,7 +719,6 @@ $(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 343afff5aa..431231d844 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2417,16 +2417,6 @@ 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 |