Merge "Support per-testcase directories in all test suites"
This commit is contained in:
commit
894e9be3f7
2 changed files with 5 additions and 3 deletions
|
@ -42,6 +42,7 @@ LOCAL_CLANG_CPPFLAGS:=
|
|||
LOCAL_CLANG_LDFLAGS:=
|
||||
LOCAL_CLASSPATH:=
|
||||
LOCAL_COMPATIBILITY_SUITE:=
|
||||
LOCAL_COMPATIBILITY_PER_TESTCASE_DIRECTORY:=
|
||||
LOCAL_COMPATIBILITY_SUPPORT_FILES:=
|
||||
LOCAL_COMPRESSED_MODULE:=
|
||||
LOCAL_CONLYFLAGS:=
|
||||
|
|
|
@ -2994,9 +2994,10 @@ endef
|
|||
# Can be passed a subdirectory to use for the common testcase directory.
|
||||
define compatibility_suite_dirs
|
||||
$(strip \
|
||||
$(if $(COMPATIBILITY_TESTCASES_OUT_INCLUDE_MODULE_FOLDER_$(1)),\
|
||||
$(COMPATIBILITY_TESTCASES_OUT_$(1))/$(LOCAL_MODULE)$(2),\
|
||||
$(COMPATIBILITY_TESTCASES_OUT_$(1))) \
|
||||
$(if $(COMPATIBILITY_TESTCASES_OUT_$(1)), \
|
||||
$(if $(COMPATIBILITY_TESTCASES_OUT_INCLUDE_MODULE_FOLDER_$(1))$(LOCAL_COMPATIBILITY_PER_TESTCASE_DIRECTORY),\
|
||||
$(COMPATIBILITY_TESTCASES_OUT_$(1))/$(LOCAL_MODULE)$(2),\
|
||||
$(COMPATIBILITY_TESTCASES_OUT_$(1)))) \
|
||||
$($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)$(2))
|
||||
endef
|
||||
|
||||
|
|
Loading…
Reference in a new issue