aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Dubach <phillipd@google.com>2009-08-14 13:48:34 -0700
committerPhil Dubach <phillipd@google.com>2009-08-19 17:03:21 -0700
commit5e3ab04d97d561d0d7d4a81e4743ce638fca45b2 (patch)
treea20424ef85295b667a27043c72ce77eefdcf3af9
parentfab87998b50c997ba4e506a080d01f606615eb19 (diff)
downloadbuild-5e3ab04d97d561d0d7d4a81e4743ce638fca45b2.tar.gz
CTS: Enable Python description/plan generator
This enables the new description/plan generator added in change 21366.
-rw-r--r--core/tasks/cts.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 4cb074eedd..17af65f54b 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -219,9 +219,10 @@ $(CORE_VM_TEST_DESC): vm-tests $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CORE_INT
$(ACP) -fv $(VMTESTS_INTERMEDIATES)/android.core.vm-tests.jar $(PRIVATE_DIR)/repository/testcases/android.core.vm-tests.jar
# 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) $(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.
#