StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2019-07-09 00:26:41 +00:00
committed by Gerrit Code Review
parent 09736b4aaf 068d101077
commit 98b9c5dded
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/base_rules.mk
View File

@@ -710,18 +710,6 @@ ifneq (,$(filter $(SOONG_OUT_DIR)%,$(LOCAL_FULL_TEST_CONFIG)))
endif endif
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),) ifneq ($(my_test_data_file_pairs),)
$(foreach pair, $(my_test_data_file_pairs), \ $(foreach pair, $(my_test_data_file_pairs), \
$(eval parts := $(subst :,$(space),$(pair))) \ $(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)), \ $(eval my_compat_dist_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \
$(src_path):$(call append-path,$(dir),$(file)))))) $(src_path):$(call append-path,$(dir),$(file))))))
endif endif
endif

10
core/definitions.mk
View File

@@ -2417,16 +2417,6 @@ define compat-copy-pair
$(if $(filter-out $(2), $(LOCAL_INSTALLED_MODULE)), $(1):$(2)) $(if $(filter-out $(2), $(LOCAL_INSTALLED_MODULE)), $(1):$(2))
endef 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. # Copies many files.
# $(1): The files to copy. Each entry is a ':' separated src:dst pair # $(1): The files to copy. Each entry is a ':' separated src:dst pair
# $(2): An optional directory to prepend to the destination # $(2): An optional directory to prepend to the destination