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

Commit 5139ce49 authored by Stuart Scott's avatar Stuart Scott
Browse files

Split the build of the CTS infrastructure from the tests. 

This allows developers to build the test packages individually without
needing to build the entire CTS release.

bug: 18945639
Change-Id: Iedc162059617f683a16a6b80cb7b1a6e0674bba4
parent 4ec52a93

core/tasks/cts.mk

+14 −25
Original line number Diff line number Diff line
@@ -69,21 +69,27 @@ CTS_CORE_CASES := $(foreach pkg,$(CTS_CORE_CASE_LIST),$(call intermediates-dir-f 
CTS_TEST_JAR_FILES := $(foreach c,$(CTS_TEST_JAR_LIST),$(call intermediates-dir-for,JAVA_LIBRARIES,$(c))/javalib.jar)



-include cts/CtsTestCaseList.mk

CTS_CASE_LIST := $(CTS_CORE_CASE_LIST) $(CTS_TEST_CASE_LIST)



# A module may have mutliple installed files (e.g. split apks)

CTS_CASE_LIST_APKS :=

CTS_CASE_LIST_APKS_DIR := $(cts_dir)/$(cts_name)/repository/testcases/

$(foreach m, $(CTS_CASE_LIST),\

$(foreach m, $(CTS_TEST_CASE_LIST),\

  $(foreach fp, $(ALL_MODULES.$(m).BUILT_INSTALLED),\

    $(eval pair := $(subst :,$(space),$(fp)))\

    $(eval CTS_CASE_LIST_APKS += $(CTS_TESTCASES_OUT)/$(notdir $(word 2,$(pair))))))\

$(foreach m, $(CTS_CORE_CASE_LIST),\

  $(foreach fp, $(ALL_MODULES.$(m).BUILT_INSTALLED),\

    $(eval pair := $(subst :,$(space),$(fp)))\

    $(eval built := $(word 1,$(pair)))\

    $(eval installed := $(CTS_CASE_LIST_APKS_DIR)/$(notdir $(word 2,$(pair))))\

    $(eval installed := $(CTS_TESTCASES_OUT)/$(notdir $(word 2,$(pair))))\

    $(eval $(call copy-one-file, $(built), $(installed)))\

    $(eval CTS_CASE_LIST_APKS += $(installed))))



CTS_CASE_LIST_JARS :=

$(foreach m, $(CTS_TEST_JAR_LIST),\

  $(eval CTS_CASE_LIST_JARS += $(CTS_TESTCASES_OUT)/$(m).jar))



DEFAULT_TEST_PLAN := $(cts_dir)/$(cts_name)/resource/plans

$(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_CASES) $(CTS_CASE_LIST_APKS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ACP) $(CTS_TEST_JAR_FILES)

$(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_JAR_FILES) $(CTS_TEST_CASES) $(CTS_CASE_LIST_APKS) $(CTS_CASE_LIST_JARS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ACP)

# Make necessary directory for CTS

	$(hide) mkdir -p $(TMP_DIR)

	$(hide) mkdir -p $(PRIVATE_DIR)/docs
@@ -91,11 +97,8 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_CASES) $(CTS_CASE_L 
	$(hide) mkdir -p $(PRIVATE_DIR)/repository/testcases

	$(hide) mkdir -p $(PRIVATE_DIR)/repository/plans

# Copy executable and JARs to CTS directory

	$(hide) $(ACP) -fp $(VMTESTSTF_JAR) $(PRIVATE_DIR)/repository/testcases

	$(hide) $(ACP) -fp $(VMTESTSTF_JAR) $(CTS_TESTCASES_OUT)

	$(hide) $(ACP) -fp $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(PRIVATE_DIR)/tools

# Change mode of the executables

	$(foreach jar,$(CTS_TEST_JAR_LIST),$(call copy-testcase-jar,$(jar)))

	$(foreach testcase,$(CTS_TEST_CASES),$(call copy-testcase,$(testcase)))

	$(hide) touch $@



# Generate the test descriptions for the core-tests
@@ -341,8 +344,7 @@ $(CORE_VM_TEST_TF_DESC): $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(JUNIT_HOST_JAR 
# Generate the default test plan for User.

# Usage: buildCts.py <testRoot> <ctsOutputDir> <tempDir> <androidRootDir> <docletPath>



$(DEFAULT_TEST_PLAN): $(cts_dir)/all_cts_files_stamp $(cts_tools_src_dir)/utils/buildCts.py $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CTS_CORE_XMLS) $(CTS_TEST_XMLS) $(CORE_VM_TEST_TF_DESC) | $(ACP)

	$(hide) $(ACP) -fp $(CTS_CORE_XMLS) $(CTS_TEST_XMLS) $(CORE_VM_TEST_TF_DESC) $(PRIVATE_DIR)/repository/testcases

$(DEFAULT_TEST_PLAN): $(cts_dir)/all_cts_files_stamp $(cts_tools_src_dir)/utils/buildCts.py $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CTS_CORE_XMLS) $(CTS_TEST_XMLS) $(CORE_VM_TEST_TF_DESC)

	$(hide) $(cts_tools_src_dir)/utils/buildCts.py cts/tests/tests/ $(PRIVATE_DIR) $(TMP_DIR) \

		$(TOP) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar

	$(hide) mkdir -p $(dir $@) && touch $@
@@ -364,16 +366,3 @@ $(INTERNAL_CTS_TARGET): $(cts_dir)/all_cts_files_stamp $(DEFAULT_TEST_PLAN) 
cts: $(INTERNAL_CTS_TARGET) adb

$(call dist-for-goals,cts,$(INTERNAL_CTS_TARGET))



define copy-testcase



$(hide) $(ACP) -fp $(1) $(PRIVATE_DIR)/repository/testcases/$(notdir $1)



endef



define copy-testcase-jar



$(hide) $(ACP) -fp $(call intermediates-dir-for,JAVA_LIBRARIES,$(1))/javalib.jar \

	$(PRIVATE_DIR)/repository/testcases/$(1).jar



endef