diff options
| author | Brian Muramatsu <btmura@google.com> | 2011-11-03 11:34:06 -0700 |
|---|---|---|
| committer | Brian Muramatsu <btmura@google.com> | 2011-11-03 11:42:39 -0700 |
| commit | 277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb (patch) | |
| tree | 55ef35bbe4a181fc4a48a0311e3b4cb285055447 /core | |
| parent | 5b85b1900c9b58db7642db2d189766767fc259be (diff) | |
| download | build-277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb.zip build-277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb.tar.gz build-277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb.tar.bz2 | |
Stop Packaging Old CTS Test Runner Files
Bug 5563917
This stops packaging the startcts script and the cts.jar into
the android-cts.zip. Since we are only testing using Tradefed,
we should prevent confusion by removing the old test runner.
Change-Id: I79f991617dd9e6a51a314207b4727cce3136d60f
Diffstat (limited to 'core')
| -rw-r--r-- | core/tasks/cts.mk | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index af20da8..fcdd987 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -17,14 +17,6 @@ cts_tools_src_dir := cts/tools cts_name := android-cts -CTS_EXECUTABLE := startcts -ifeq ($(HOST_OS),windows) - CTS_EXECUTABLE_PATH := $(cts_tools_src_dir)/host/etc/cts.bat -else - CTS_EXECUTABLE_PATH := $(cts_tools_src_dir)/utils/$(CTS_EXECUTABLE) -endif -CTS_HOST_JAR := $(HOST_OUT_JAVA_LIBRARIES)/cts.jar - DDMLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/ddmlib-prebuilt.jar junit_host_jar := $(HOST_OUT_JAVA_LIBRARIES)/junit.jar HOSTTESTLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar @@ -59,13 +51,10 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB $(hide) mkdir -p $(PRIVATE_DIR)/repository/testcases $(hide) mkdir -p $(PRIVATE_DIR)/repository/plans # Copy executable and JARs to CTS directory - $(hide) $(ACP) -fp $(CTS_HOST_JAR) $(CTS_EXECUTABLE_PATH) $(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 + $(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 - $(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 to CTS directory - $(hide) $(ACP) -fp $(cts_tools_src_dir)/utils/host_config.xml $(PRIVATE_DIR)/repository/ $(hide) touch $@ # Generate the test descriptions for the core-tests |