eclair snapshot

[android-x86/build.git] / core / tasks / cts.mk

diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index f804813..cfd72e7 100644 (file)
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -17,14 +17,17 @@ cts_tools_src_dir := cts/tools
 
 cts_name := android-cts
 
-CTS_EXECUTABLE := cts
+CTS_EXECUTABLE := startcts
 ifeq ($(HOST_OS),windows)
     CTS_EXECUTABLE_PATH := $(cts_tools_src_dir)/host/etc/cts.bat
 else
-    CTS_EXECUTABLE_PATH := $(HOST_OUT_EXECUTABLES)/$(CTS_EXECUTABLE)
+    CTS_EXECUTABLE_PATH := $(cts_tools_src_dir)/utils/$(CTS_EXECUTABLE)
 endif
 CTS_HOST_JAR := $(HOST_OUT_JAVA_LIBRARIES)/cts.jar
 
+junit_host_jar := $(HOST_OUT_JAVA_LIBRARIES)/junit.jar
+HOSTTESTLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar
+
 CTS_CORE_CASE_LIST := android.core.tests.annotation \
        android.core.tests.archive \
        android.core.tests.concurrent \
@@ -44,7 +47,20 @@ CTS_CORE_CASE_LIST := android.core.tests.annotation \
        android.core.tests.sql \
        android.core.tests.text \
        android.core.tests.xml \
-       android.core.tests.xnet
+       android.core.tests.xnet \
+       android.core.tests.runner
+
+CTS_SECURITY_APPS_LIST := \
+       CtsAppAccessData \
+       CtsAppWithData \
+       CtsInstrumentationAppDiffCert \
+       CtsPermissionDeclareApp \
+       CtsSharedUidInstall \
+       CtsSharedUidInstallDiffCert \
+       CtsSimpleAppInstall \
+       CtsSimpleAppInstallDiffCert \
+       CtsTargetInstrumentationApp \
+       CtsUsePermissionDiffCert
 
 CTS_CASE_LIST := \
        DeviceInfoCollector \
@@ -52,15 +68,23 @@ CTS_CASE_LIST := \
        CtsAppTestCases \
        CtsContentTestCases \
        CtsDatabaseTestCases \
+       CtsDpiTestCases \
+       CtsDpiTestCases2 \
+    CtsGestureTestCases \
        CtsGraphicsTestCases \
        CtsHardwareTestCases \
        CtsLocationTestCases \
+       CtsMediaTestCases \
        CtsOsTestCases \
        CtsPermissionTestCases \
+       CtsPermission2TestCases \
        CtsProviderTestCases \
+       CtsSpeechTestCases \
+       CtsTelephonyTestCases \
        CtsTextTestCases \
        CtsUtilTestCases \
        CtsViewTestCases \
+       CtsWebkitTestCases \
        CtsWidgetTestCases \
        CtsNetTestCases \
        SignatureTest \
@@ -71,11 +95,14 @@ CTS_CASE_LIST := \
        CtsPerformance5TestCases \
        ApiDemos \
        ApiDemosReferenceTest \
-       $(CTS_CORE_CASE_LIST)
+       $(CTS_CORE_CASE_LIST) \
+       $(CTS_SECURITY_APPS_LIST)
 
 DEFAULT_TEST_PLAN := $(PRIVATE_DIR)/resource/plans
 
-$(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) | $(ACP)
+$(cts_dir)/all_cts_files_stamp: PRIVATE_JUNIT_HOST_JAR := $(junit_host_jar)
+
+$(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB_JAR) $(ACP)
 # Make necessary directory for CTS
        @rm -rf $(PRIVATE_CTS_DIR)
        @mkdir -p $(TMP_DIR)
@@ -86,23 +113,30 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) | $(ACP)
 # Copy executable to CTS directory
        $(hide) $(ACP) -fp $(CTS_HOST_JAR) $(PRIVATE_DIR)/tools
        $(hide) $(ACP) -fp $(CTS_EXECUTABLE_PATH) $(PRIVATE_DIR)/tools
+# Copy junit jar
+       $(hide) $(ACP) -fp $(PRIVATE_JUNIT_HOST_JAR) $(PRIVATE_DIR)/tools
+# Copy hosttestlib jar
+       $(hide) $(ACP) -fp $(HOSTTESTLIB_JAR) $(PRIVATE_DIR)/tools
 # Change mode of the executables
        $(hide) chmod ug+rwX $(PRIVATE_DIR)/tools/$(notdir $(CTS_EXECUTABLE_PATH))
        $(foreach apk,$(CTS_CASE_LIST), \
                        $(call copy-testcase-apk,$(apk)))
-# Copy CTS host config and start script to CTS directory
+# Copy CTS host config to CTS directory
        $(hide) $(ACP) -fp $(cts_tools_src_dir)/utils/host_config.xml $(PRIVATE_DIR)/repository/
-       $(hide) $(ACP) -fp $(cts_tools_src_dir)/utils/startcts $(PRIVATE_DIR)/tools/
        $(hide) touch $@
 
 # Generate the test descriptions for the core-tests
-
+# Parameters:
+# $1 : The output file where the description should be written (without the '.xml' extension)
+# $2 : The AndroidManifest.xml corresponding to the test package
+# $3 : The name of the TestSuite generator class to use
+# $4 : The Android.mk corresponding to the test package (required for host-side tests only)
 define generate-core-test-description
 @echo "Generate core-test description ("$(notdir $(1))")"
 $(hide) java $(PRIVATE_JAVAOPTS) \
        -classpath $(PRIVATE_CLASSPATH) \
        $(PRIVATE_PARAMS) CollectAllTests $(1) \
-       $(2) $(3)
+       $(2) $(3) $(4)
 endef
 
 CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core,,COMMON)
@@ -204,10 +238,17 @@ $(CORE_VM_TEST_DESC): vm-tests $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CORE_INT
                dot.junit.AllJunitHostTests, cts/tools/vm-tests/Android.mk)
        $(ACP) -fv $(VMTESTS_INTERMEDIATES)/android.core.vm-tests.jar $(PRIVATE_DIR)/repository/testcases/android.core.vm-tests.jar
 
+# Move app security host-side tests to the repository
+APP_SECURITY_LIB := $(cts_dir)/$(cts_name)/repository/testcases/CtsAppSecurityTests.jar
+
+$(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.
-$(DEFAULT_TEST_PLAN): $(cts_dir)/all_cts_files_stamp $(cts_dir)/all_cts_core_files_stamp $(cts_tools_src_dir)/utils/genDefaultTestPlan.sh $(CORE_VM_TEST_DESC)
-       $(hide) bash $(cts_tools_src_dir)/utils/genDefaultTestPlan.sh cts/tests/tests/ \
-     $(PRIVATE_DIR) $(TMP_DIR) $(TOP) $(TARGET_COMMON_OUT_ROOT) $(OUT_DIR)
+# 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_DESC) $(APP_SECURITY_LIB) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar
+       $(hide) $(cts_tools_src_dir)/utils/buildCts.py cts/tests/tests/ $(PRIVATE_DIR) $(TMP_DIR) \
+               $(TOP) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar
 
 # Package CTS and clean up.
 #