StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c539dbe6: CTS: Add missing integration of 147397 to fix VM tests

Browse Source 
Merge commit 'c539dbe6a2810818ac22f180e64bdc0256557532'

* commit 'c539dbe6a2810818ac22f180e64bdc0256557532':
  CTS: Add missing integration of 147397 to fix VM tests
This commit is contained in:
Phil Dubach
2009-08-11 18:11:22 -07:00
committed by Android Git Automerger
parent 3b55dfc9a7 c539dbe6a2
commit 378a5884da
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/tasks/cts.mk
View File

@@ -106,13 +106,17 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(ACP)
$(hide) touch $@ $(hide) touch $@
# Generate the test descriptions for the core-tests # 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 define generate-core-test-description
@echo "Generate core-test description ("$(notdir $(1))")" @echo "Generate core-test description ("$(notdir $(1))")"
$(hide) java $(PRIVATE_JAVAOPTS) \ $(hide) java $(PRIVATE_JAVAOPTS) \
-classpath $(PRIVATE_CLASSPATH) \ -classpath $(PRIVATE_CLASSPATH) \
$(PRIVATE_PARAMS) CollectAllTests $(1) \ $(PRIVATE_PARAMS) CollectAllTests $(1) \
$(2) $(3) $(2) $(3) $(4)
endef endef
CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core,,COMMON) CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core,,COMMON)