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

Merge "Support per-testcase directories in all test suites" am: 894e9be3f7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1838354

Change-Id: I27999b873212cb1ab52cb75a7dd9a6992d595145
This commit is contained in:
Colin Cross
2021-10-01 16:46:26 +00:00
committed by Automerger Merge Worker
parent e6a4320cb0 894e9be3f7
commit 651b8b7eb0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/clear_vars.mk
View File

@@ -42,6 +42,7 @@ LOCAL_CLANG_CPPFLAGS:=
LOCAL_CLANG_LDFLAGS:= LOCAL_CLANG_LDFLAGS:=
LOCAL_CLASSPATH:= LOCAL_CLASSPATH:=
LOCAL_COMPATIBILITY_SUITE:= LOCAL_COMPATIBILITY_SUITE:=
LOCAL_COMPATIBILITY_PER_TESTCASE_DIRECTORY:=
LOCAL_COMPATIBILITY_SUPPORT_FILES:= LOCAL_COMPATIBILITY_SUPPORT_FILES:=
LOCAL_COMPRESSED_MODULE:= LOCAL_COMPRESSED_MODULE:=
LOCAL_CONLYFLAGS:= LOCAL_CONLYFLAGS:=

7
core/definitions.mk
View File

@@ -2994,9 +2994,10 @@ endef
# Can be passed a subdirectory to use for the common testcase directory. # Can be passed a subdirectory to use for the common testcase directory.
define compatibility_suite_dirs define compatibility_suite_dirs
$(strip \ $(strip \
$(if $(COMPATIBILITY_TESTCASES_OUT_INCLUDE_MODULE_FOLDER_$(1)),\ $(if $(COMPATIBILITY_TESTCASES_OUT_$(1)), \
$(COMPATIBILITY_TESTCASES_OUT_$(1))/$(LOCAL_MODULE)$(2),\ $(if $(COMPATIBILITY_TESTCASES_OUT_INCLUDE_MODULE_FOLDER_$(1))$(LOCAL_COMPATIBILITY_PER_TESTCASE_DIRECTORY),\
$(COMPATIBILITY_TESTCASES_OUT_$(1))) \ $(COMPATIBILITY_TESTCASES_OUT_$(1))/$(LOCAL_MODULE)$(2),\
$(COMPATIBILITY_TESTCASES_OUT_$(1)))) \
$($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)$(2)) $($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)$(2))
endef endef