diff options
| -rw-r--r-- | core/definitions.mk | 4 | ||||
| -rw-r--r-- | core/main.mk | 2 | ||||
| -rw-r--r-- | core/tasks/vts-core-tests.mk | 9 |
3 files changed, 13 insertions, 2 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 381a2a70bc..d4d89c2ec9 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2847,7 +2847,9 @@ endef # Can be passed a subdirectory to use for the common testcase directory. define compatibility_suite_dirs $(strip \ - $(COMPATIBILITY_TESTCASES_OUT_$(1)) \ + $(if $(COMPATIBILITY_TESTCASES_OUT_INCLUDE_MODULE_FOLDER_$(1)),\ + $(COMPATIBILITY_TESTCASES_OUT_$(1))/$(LOCAL_MODULE)$(2),\ + $(COMPATIBILITY_TESTCASES_OUT_$(1))) \ $($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)$(2)) endef diff --git a/core/main.mk b/core/main.mk index b91770b08b..d786ba4e9d 100644 --- a/core/main.mk +++ b/core/main.mk @@ -75,6 +75,8 @@ $(shell mkdir -p $(EMPTY_DIRECTORY) && rm -rf $(EMPTY_DIRECTORY)/*) -include test/suite_harness/tools/cts-instant-tradefed/build/config.mk # MTS-specific config. -include test/mts/tools/build/config.mk +# VTS-Core-specific config. +-include test/vts/tools/vts-core-tradefed/build/config.mk # Clean rules .PHONY: clean-dex-files diff --git a/core/tasks/vts-core-tests.mk b/core/tasks/vts-core-tests.mk index fb1e1c61ff..95b729ab72 100644 --- a/core/tasks/vts-core-tests.mk +++ b/core/tasks/vts-core-tests.mk @@ -44,6 +44,13 @@ $(vts-core-zip) : $(COMPATIBILITY.vts-core.FILES) $(my_host_shared_lib_for_vts_c $(PRIVATE_vts_core_list) vts-core: $(vts-core-zip) -$(call dist-for-goals, vts-core, $(vts-core-zip) $(vts-core-list-zip) $(vts-core-configs-zip)) + +test_suite_name := vts-core +test_suite_tradefed := vts-core-tradefed +test_suite_readme := test/vts/tools/vts-core-tradefed/README +include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk +vts-core: $(compatibility_zip) + +$(call dist-for-goals, vts-core, $(vts-core-zip) $(vts-core-list-zip) $(vts-core-configs-zip) $(compatibility_zip)) tests: vts-core |