Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9bef81f authored by Dan Shi's avatar Dan Shi Committed by Gerrit Code Review
Browse files

Merge "Create a vts-core suite harness package"

parents 8bfd896e 796ff4ff

core/definitions.mk

+3 −1
Original line number Diff line number Diff line
@@ -2857,7 +2857,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

core/main.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

core/tasks/vts-core-tests.mk

+8 −1
Original line number Diff line number Diff line
@@ -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