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

Commit fea66cee authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android (Google) Code Review
Browse files

Merge "Build Support for CTS Native Tests" into ics-mr1

parents 615d2ffa 237fa073

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,full 
LOCAL_PROTOC_FLAGS:=

LOCAL_NO_CRT:=

LOCAL_PROPRIETARY_MODULE:=

LOCAL_CTS_TEST_PACKAGE:=



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.

core/tasks/cts.mk

+13 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ DEFAULT_TEST_PLAN := $(cts_dir)/$(cts_name)/resource/plans 
$(cts_dir)/all_cts_files_stamp: PRIVATE_JUNIT_HOST_JAR := $(junit_host_jar)



-include cts/CtsHostLibraryList.mk

$(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ACP)

$(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(CTS_TEST_CASES) $(junit_host_jar) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ACP)

# Make necessary directory for CTS

	$(hide) rm -rf $(PRIVATE_CTS_DIR)

	$(hide) mkdir -p $(TMP_DIR)
@@ -53,8 +53,8 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB 
# Copy executable and JARs to CTS directory

	$(hide) $(ACP) -fp $(DDMLIB_JAR) $(PRIVATE_JUNIT_HOST_JAR) $(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 apk,$(CTS_CASE_LIST), \

			$(call copy-testcase-apk,$(apk)))

	$(foreach apk,$(CTS_CASE_LIST),$(call copy-testcase-apk,$(apk)))

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

	$(hide) touch $@



# Generate the test descriptions for the core-tests
@@ -165,9 +165,12 @@ APP_SECURITY_LIB := $(cts_dir)/$(cts_name)/repository/testcases/CtsAppSecurityTe 
$(APP_SECURITY_LIB): $(HOST_OUT_JAVA_LIBRARIES)/CtsAppSecurityTests.jar $(cts_dir)/all_cts_files_stamp $(ACP)

	$(ACP) -fv $(HOST_OUT_JAVA_LIBRARIES)/CtsAppSecurityTests.jar $(APP_SECURITY_LIB)





# 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_dir)/all_cts_core_files_stamp $(cts_tools_src_dir)/utils/buildCts.py $(CORE_VM_TEST_TF_DESC) $(CORE_VM_TEST_DESC) $(APP_SECURITY_LIB) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar



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

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

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

		$(TOP) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar
@@ -194,3 +197,9 @@ $(hide) $(ACP) -fp $(call intermediates-dir-for,APPS,$(1))/package.apk \ 
	$(PRIVATE_DIR)/repository/testcases/$(1).apk



endef



define copy-testcase



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



endef