summaryrefslogtreecommitdiffstats
path: root/core/tasks/cts.mk
Commit message (Collapse)AuthorAgeFilesLines
* Fix up android.core CTS tests.Narayan Kamath2014-02-171-75/+81
| | | | | | | | | | | | Fix several wrongly configured tests that were either looking for tests in the wrong jar (apache-harmony-tests instead of core-tests) or using the wrong prefix. Also, this change creates subsets of the harmony tests based on subpackage names (java.net, java.io, java.nio etc.) instead of the earlier harmony groupings. Change-Id: Iea0e20d23512611d1aac92b2f8219031b6396c77
* changing the rules following java package renaming forTsu Chiang Chuang2014-02-171-13/+13
| | | | | | | | external/apache-harmony. (cherry picked from commit 27b4b5ffe12b179fc0d24747f9ead2d5f52c871a) Change-Id: Ia5a7b2d401f23dfdc556ef1982efd441ed1d1ae2
* Adding apache-harmony to cts.Tsu Chiang Chuang2014-02-171-4/+122
| | | | | | (cherry-picked from commit 5fef52e9c986184796ff1e5fe54390614ba318a6) Change-Id: I9a6595f5e8bc30654a062e0917d3ecd3ba28ebc7
* add jsr166 tests to cts.Tsu Chiang Chuang2014-02-171-3/+14
| | | | | | Bug: 10390711 Change-Id: I512770e98f61995fc33043d35562dc3b213a4930
* resolved conflicts for merge of b4ada1cc to klp-dev-plus-aospKenny Root2013-09-121-3/+3
|\ | | | | | | Change-Id: Id312795c1401e00c81c9b8d0712222f2933d8fcd
| * Add Junit4 to the classpath for CollectAllTestsKenny Root2013-09-101-3/+3
| | | | | | | | | | | | This is needed for CollectAllTests to work with Junit4 tests. Change-Id: I5e339022220b8e40bcb12337a09f3615dad7d53c
* | Add libcore.conscrypt tests back to CTSKenny Root2013-09-051-2/+12
| | | | | | | | | | | | | | | | | | A reorganization of the libcore test jar files caused the Conscrypt tests to be accidentally dropped from CTS. Add them back in their own package. Bug: 10210673 Change-Id: Ia46a5de925c35115d25b7c0f974eba5b27bbfcd6
* | Demultiplex the coretests description rulesYing Wang2013-07-101-1/+18
| | | | | | | | | | | | | | | | Previously for each target generate-core-test-description will be called 6 times that end in 6x6 calls of the function. That's unnecessary and unsafe. Change-Id: I03eef89b61c552b5f47f0a478feb9687fd9717da
* | Clean up files' dependencies on phony targets.Ying Wang2013-07-101-3/+3
|/ | | | | | | | | | Module names are phony targets, which make always sees as obsolete, so a nothing-to-do build won't do nothing. Also file target $(DEFAULT_TEST_PLAN) was never created in its rule. Here it's fixed with a stamp file. Bug:9761012 Change-Id: Ic82df70cc22643d902017b5bec1022404d9bbfce
* Track change to JSSE providerKenny Root2013-04-291-1/+2
| | | | Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
* Add OkHttp to the platform.jwilson2013-04-021-2/+3
| | | | Change-Id: I18716683632249573295cb2eb5229a1188ed0f17
* CTS: work around ClassLoader limitationKenny Root2013-02-271-0/+1
| | | | | | | | | | | Trying to use reflection on classes loaded from a different ClassLoader than the system one caused SecurityException since you can't load certain packages. Adding them to the boot classpath forces them to be in the same ClassLoader. Change-Id: Id518ab0a99da6defac525c0ad430a63f600ce85f
* android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.Ying Wang2012-08-211-1/+1
| | | | | Bug: 7019588 Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
* Avoid Rebuilding Core and VMTest DescriptionsBrian Muramatsu2012-01-051-28/+34
| | | | | | | | | | | | | | | | | | | | | Only generate the core test and vmtest descriptions when something has actually changed rather than everytime CTS is built. This should make iterative test development in CTS more pleasant. The rule targets are changed to be the paths of the test description XML files in a separate directory outside of the CTS distribution. The buildCts.py rule copies these XMLs when they change to the final CTS distribution location and creates the final plan file. The dependencies have also been changed to reply upon the full package paths rather than their phony targets to avoid rebuilding everything all the time. Finally, the AppSecurity rule was removed, because I have taken care of that in my prior change to the Makefiles in the CTS project. Change-Id: I88b92c7a4cb4c2c2e20f06641e7ba0604d37f805
* Stop Building CTS VM TestsBrian Muramatsu2011-12-161-25/+2
| | | | | | | | Bug 5728172 The VM tests were used with the old test runner. Change-Id: I7ba819a394bb9643f937240ebd315d7d7820a8bf
* Build Support for CTS Native TestsBrian Muramatsu2011-12-131-4/+13
| | | | | | | | | | | | | | | | | | | | Bug 4970300 Adds two new variables, CTS_TEST_CASES and CTS_TEST_XMLS, to be read from CtsTestCaseList.mk. The CTS_TEST_CASES variable can be used to copy any sort of file to the repository/testcases CTS directory. The CTS_TEST_XMLS variable can be used to inject test package xmls from any source rather than relying upon the monolithic and mostly serial buildCts.py script. The existing CTS_CORE_CASE_LIST is coded to only support APKs, so it could not be retrofitted to support native tests. However, the two new variables can do even more than CTS_CORE_CASE_LIST due to their generality. In the future, the idea is move away from CTS_CORE_CASE_LIST and also generate XMLs using separate tools rather than just buildCts.py. Change-Id: Ib52722861c37e0f4d511f9041928395bcaba5dea
* Stop Packaging Old CTS Test Runner FilesBrian Muramatsu2011-11-031-12/+1
| | | | | | | | | | 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
* am 8658fa51: am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5Brian Muramatsu2011-09-091-1/+1
|\ | | | | | | | | * commit '8658fa51d15290cf43178d0633b53f11ff08a4aa': Disable Dexpreopt for generic_arm5
| * am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5Brian Muramatsu2011-09-081-1/+1
| |\ | | | | | | | | | | | | * commit '9d014e6570deb3861b503833823e56e1c589626c': Disable Dexpreopt for generic_arm5
| | * Disable Dexpreopt for generic_arm5Brian Muramatsu2011-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5267392 After coming across another place where I would have to use package.apk.unaligned, I decided maybe it is best to just disable dexpreopt as was previously suggested. Use package.apks in the CTS Makefile task. Change-Id: Iec839a72f4b53441337523b8a9cccda657eec8e8
* | | am 3eae5b7c: am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS BuildBrian Muramatsu2011-09-081-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '3eae5b7c1b3197bed4c883a671cfea9d5d9570bf': Use package.apk.unaligned in CTS Build
| * | am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS BuildBrian Muramatsu2011-09-021-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '08b8e0024812ea907cf3938bcd07b8dca6188eaf': Use package.apk.unaligned in CTS Build
| | * Use package.apk.unaligned in CTS BuildBrian Muramatsu2011-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5252989 This prevents dexopt installation failures when trying to install CTS apks on production devices. Change-Id: I1eeb0ac567c3be3b831c8c27dee4005ec00fd7cd
* | | fix mixing argument in makefile.Tsu Chiang Chuang2011-07-131-1/+1
| | | | | | | | | | | | Change-Id: I659d996dda0a2047ebb3240607e66411fc60fda6
* | | Breakup android.core.tests.libcore based on top level package nameBrian Carlstrom2011-05-271-9/+34
| | | | | | | | | | | | | | | | | | git cherry-pick --no-commit ec122eb2c11dfb8553d3707208a1ecbe7366f61b Change-Id: I685ece362674f83f179ace34367fce88a7f541fb
* | | adding TF dependency to vm-tf, since now we are using cts-tf things.Tsu Chiang Chuang2011-05-161-2/+2
| | | | | | | | | | | | Change-Id: Ia7538dc204faa93f47cd3fd104ed05c9da3e8741
* | | adding a new package to run vm tests in cts-tfTsu Chiang Chuang2011-04-271-1/+24
| | | | | | | | | | | | Change-Id: I523860b4e73b11cc158706a30e6694d9188a6697
* | | Tracking merge of dalvik-dev to masterBrian Carlstrom2011-04-011-45/+20
|/ / | | | | | | | | | | | | | | | | | | | | | | git cherry-pick --no-commit 5fac8d8f7096d8a950acad1ad0a8b963cef72e03 git cherry-pick --no-commit 1a8210710b46a0796ff2f8e76b6beb3a54f89019 git cherry-pick --no-commit 4fe2ac9f7284b838393aec8f0f48caef2510fd46 git cherry-pick --no-commit 7beb710a8f976fc4cb1e8be780644386870c4975 Change-Id: Ib10348e5509c906c6b95fa4accd6a18900bfe748
* | Build cts-tradefed README into cts.zipBrett Chabot2011-02-181-2/+3
| | | | | | | | Change-Id: Idd2d36a021eb706846673a1ebc417a1f4c3b9d38
* | Merge "Add cts-tradefed to cts build." into honeycombBrett Chabot2011-01-311-2/+5
|\ \
| * | Add cts-tradefed to cts build.Brett Chabot2011-01-311-2/+5
| | | | | | | | | | | | | | | | | | Bug 3403768 Change-Id: I0ca2068f93f25b2f5f6691c5ce70573da4a12aa6
* | | am a4781e86: Merge from open-source gingerbreadJean-Baptiste Queru2011-01-291-9/+10
|\ \ \ | |/ / |/| / | |/ | | * commit 'a4781e867f2e9115ce5b8085576bebf6505bfd00': CTS: pass vogar expectation location to CollectAllTests.
| * CTS: pass vogar expectation location to CollectAllTests.Brett Chabot2011-01-071-9/+10
| | | | | | | | | | | | Bug 3181338 Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658
* | Change from @ to $(hide) in CTS BuildBrian Muramatsu2010-12-061-7/+7
| | | | | | | | Change-Id: Ibda485105f750e971260088785904ea420cbaa03
* | am 6e644e14: am ebf4b519: cherry pick \'CTS vm-tests depend on hostestlib\' ↵Brett Chabot2010-10-271-2/+2
|\ \ | |/ | | | | into GB.
| * cherry pick 'CTS vm-tests depend on hostestlib' into GB.Brett Chabot2010-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Original description: CTS vm-tests now depend on hosttestlib. Bug 3125713 Conflicts: core/tasks/cts.mk Change-Id: I9e364a9d9d2cae396691921424ca591beca05468
* | am 99185c2a: am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to ↵Brian Muramatsu2010-10-101-10/+4
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit '99185c2a462d563855e4bc0c1e5649a21b2e186b' * commit '99185c2a462d563855e4bc0c1e5649a21b2e186b': Support Additional CTS Host Jars
| * resolved conflicts for merge of 0f8fcbe2 to gingerbreadBrian Muramatsu2010-10-071-10/+4
| |\ | | | | | | | | | Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
| | * Support Additional CTS Host JarsBrian Muramatsu2010-10-051-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include another optional Makefile from the CTS project that specifies additional JARs that the CTS host may need. This will make it easier to create modules in the CTS project that can be built for the host and device and shared between the host and test cases. The first such library will include annotations like "RequiresFeature" and "SupportsProfile" that will be needed to support multiple device profiles in CTS. Another planned libraries could include defining the CTS version number in a central spot and sharing code used to probe for certain properties like the OpenGL version and other system properties. Can be checked in after this other change without causing breakage: https://review.source.android.com/#change,16740 Change-Id: I3c488247b66522dc86277ab43198c34f790e0618
| * | Package ddmlib-prebuilt with CTS.Xavier Ducrohet2010-09-271-0/+3
| | | | | | | | | | | | This ensures that CTS is using a compatible ddmlib.
| * | Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-041-61/+13
| |/ | | | | | | | | | | | | | | | | git cherry-pick --no-commit f2f3e4b2 git cherry-pick --no-commit b6a08f0cd36b12054ac73992a2737ea294387116 git cherry-pick --no-commit d05d74b2d6f717ee25ca14c913ea7610c030ecd1 git cherry-pick --no-commit 5479d77e320420ef0cd7250d1a6729839ef907ce Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
* | am 45270759: am e743c53b: Package ddmlib-prebuilt with CTS.Xavier Ducrohet2010-07-281-0/+3
|\ \ | | | | | | | | | | | | | | | | | | Merge commit '45270759642c03bdbe39ae261e22160d2c64ecec' * commit '45270759642c03bdbe39ae261e22160d2c64ecec': Package ddmlib-prebuilt with CTS.
| * \ am e743c53b: Package ddmlib-prebuilt with CTS.Xavier Ducrohet2010-07-281-0/+3
| |\ \ | | |/ | |/| | | | | | | | | | | | | Merge commit 'e743c53b88faf35be47667b0252c881c7b32f856' into gingerbread-plus-aosp * commit 'e743c53b88faf35be47667b0252c881c7b32f856': Package ddmlib-prebuilt with CTS.
| | * Package ddmlib-prebuilt with CTS.Xavier Ducrohet2010-07-281-0/+3
| | | | | | | | | | | | | | | | | | This ensures that CTS is using a compatible ddmlib. Change-Id: Iff6d2bfec873949dfd07ccf758bf257350f11298
* | | am 4e8e998e: am 989fade3: am af44485f: merge from open-source froyoThe Android Open Source Project2010-07-261-53/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4' * commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4': Include Test Case List from CTS Project
| * | Include Test Case List from CTS ProjectBrian Muramatsu2010-07-221-53/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2732160 Have the cts.mk include the test case list from CTS rather than defining it in cts.mk. This permits CTS developers to add new packages and applications without having to submit multiple project changes to both the CTS and build projects everytime. Change-Id: I63d90ac4f5d9fc9a9aa0ff79a8bf9dfb1a79c822
| * | Build Accessibility Tests and APKBrian Muramatsu2010-07-081-0/+2
| |/ | | | | | | | | | | | | | | | | Bug 2814482 Froyo's cts.mk was missing two lines added to Eclair's cts.mk that are needed to build the accessibility tests and apk. Change-Id: I05f93bc0a56b2ec1e07eab8c7a15ef7d4bb90d18
* | Require a directory that could actually exist.Joe Onorato2010-06-151-1/+1
| | | | | | | | Change-Id: I6030a062dc9f6a40ea32ecbb612c2b9353fc1af6
* | Fix "make cts" for refactored libcoreBrian Carlstrom2010-05-281-5/+12
| | | | | | | | Change-Id: I718ee82681a4989205118d3e828567971e5f1849
* | Deleting test builds obsoleted by libcore reorgBrian Carlstrom2010-05-281-56/+1
| | | | | | | | Change-Id: Ia8f5984e5ba03d1429c31c48d098cb044305cab1