p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Common testcase directories: Clean up duplicates"

This commit is contained in:
Treehugger Robot 2017-04-12 08:10:19 +00:00 committed by Gerrit Code Review
parent 4e789c2e57 8a431d9c7d
commit 4d15a84fc0
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/base_rules.mk
View File

@ -431,9 +431,27 @@ endif
########################################################### ###########################################################
ifdef LOCAL_COMPATIBILITY_SUITE ifdef LOCAL_COMPATIBILITY_SUITE
# If we are building a native test or benchmark and its stem variants are not defined,
# separate the multiple architectures into subdirectories of the testcase folder.
arch_dir :=
is_native :=
ifeq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS)
is_native := true
endif
ifeq ($(LOCAL_MODULE_CLASS),NATIVE_BENCHMARK)
is_native := true
endif
ifdef LOCAL_MULTILIB
is_native := true
endif
ifdef is_native
arch_dir := /$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)
is_native :=
endif
# The module itself. # The module itself.
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_$(suite) := $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \ $(eval my_compat_dist_$(suite) := $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \
$(LOCAL_BUILT_MODULE):$(dir)/$(my_installed_module_stem)))) $(LOCAL_BUILT_MODULE):$(dir)/$(my_installed_module_stem))))
# Make sure we only add the files once for multilib modules. # Make sure we only add the files once for multilib modules.

5
core/definitions.mk
View File

@ -3235,11 +3235,12 @@ endef
## Compatibility suite tools ## Compatibility suite tools
########################################################### ###########################################################
# Return a list of output directories for a given suite and the current LOCAL_MODULE # Return a list of output directories for a given suite and the current LOCAL_MODULE.
# Can be passed a subdirectory to use for the common testcase directory.
define compatibility_suite_dirs define compatibility_suite_dirs
$(strip \ $(strip \
$(COMPATIBILITY_TESTCASES_OUT_$(1)) \ $(COMPATIBILITY_TESTCASES_OUT_$(1)) \
$($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)) $($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)$(2))
endef endef
# For each suite: # For each suite:

2
core/tasks/device-tests.mk
View File

@ -21,7 +21,7 @@ $(device-tests-zip): $(COMPATIBILITY.device-tests.FILES) $(SOONG_ZIP)
sed -i -e 's/\s\+/\n/g' $@.list sed -i -e 's/\s\+/\n/g' $@.list
grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true
grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true
$(hide) $(SOONG_ZIP) -d -o $@ -C $(HOST_OUT) -l $@-host.list -C $(PRODUCT_OUT) -l $@-target.list $(hide) $(SOONG_ZIP) -d -o $@ -P host -C $(HOST_OUT) -l $@-host.list -P target -C $(PRODUCT_OUT) -l $@-target.list
device-tests: $(device-tests-zip) device-tests: $(device-tests-zip)
$(call dist-for-goals, device-tests, $(device-tests-zip)) $(call dist-for-goals, device-tests, $(device-tests-zip))

2
core/tasks/general-tests.mk
View File

@ -20,7 +20,7 @@ $(general-tests-zip): $(COMPATIBILITY.general-tests.FILES) $(SOONG_ZIP)
sed -i -e 's/\s\+/\n/g' $@.list sed -i -e 's/\s\+/\n/g' $@.list
grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true
grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true
$(hide) $(SOONG_ZIP) -d -o $@ -C $(HOST_OUT) -l $@-host.list -C $(PRODUCT_OUT) -l $@-target.list $(hide) $(SOONG_ZIP) -d -o $@ -P host -C $(HOST_OUT) -l $@-host.list -P target -C $(PRODUCT_OUT) -l $@-target.list
general-tests: $(general-tests-zip) general-tests: $(general-tests-zip)
$(call dist-for-goals, general-tests, $(general-tests-zip)) $(call dist-for-goals, general-tests, $(general-tests-zip))