Commit graph

80 commits

Author SHA1 Message Date
Ying Wang
02d75da447 android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
2012-08-21 11:54:49 -07:00
Brian Muramatsu
c0a6924101 Avoid Rebuilding Core and VMTest Descriptions
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
2012-01-05 18:44:16 -08:00
Brian Muramatsu
5fc0057b7d Stop Building CTS VM Tests
Bug 5728172

The VM tests were used with the old test runner.

Change-Id: I7ba819a394bb9643f937240ebd315d7d7820a8bf
2011-12-16 13:07:15 -08:00
Brian Muramatsu
237fa07339 Build Support for CTS Native Tests
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
2011-12-13 14:14:36 -08:00
Brian Muramatsu
277be2fe0c 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
2011-11-03 11:42:39 -07:00
Brian Muramatsu
164285e05f am 8658fa51: am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5
* commit '8658fa51d15290cf43178d0633b53f11ff08a4aa':
  Disable Dexpreopt for generic_arm5
2011-09-09 12:04:27 -07:00
Brian Muramatsu
8658fa51d1 am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5
* commit '9d014e6570deb3861b503833823e56e1c589626c':
  Disable Dexpreopt for generic_arm5
2011-09-08 10:26:29 -07:00
Brian Muramatsu
d47da70817 am 3eae5b7c: am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS Build
* commit '3eae5b7c1b3197bed4c883a671cfea9d5d9570bf':
  Use package.apk.unaligned in CTS Build
2011-09-08 10:08:27 -07:00
Brian Muramatsu
9353a3be5f Disable Dexpreopt for generic_arm5
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
2011-09-07 18:12:22 -07:00
Brian Muramatsu
3eae5b7c1b am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS Build
* commit '08b8e0024812ea907cf3938bcd07b8dca6188eaf':
  Use package.apk.unaligned in CTS Build
2011-09-02 16:56:07 -07:00
Brian Muramatsu
2306106d3e Use package.apk.unaligned in CTS Build
Bug 5252989

This prevents dexopt installation failures when trying to
install CTS apks on production devices.

Change-Id: I1eeb0ac567c3be3b831c8c27dee4005ec00fd7cd
2011-09-02 15:29:10 -07:00
Tsu Chiang Chuang
44802a22e3 fix mixing argument in makefile.
Change-Id: I659d996dda0a2047ebb3240607e66411fc60fda6
2011-07-13 16:40:33 -07:00
Brian Carlstrom
af85000e7a Breakup android.core.tests.libcore based on top level package name
git cherry-pick --no-commit ec122eb2c11dfb8553d3707208a1ecbe7366f61b

Change-Id: I685ece362674f83f179ace34367fce88a7f541fb
2011-05-27 00:04:57 -07:00
Tsu Chiang Chuang
77440f3c37 adding TF dependency to vm-tf, since now we are using cts-tf things.
Change-Id: Ia7538dc204faa93f47cd3fd104ed05c9da3e8741
2011-05-16 14:08:12 -07:00
Tsu Chiang Chuang
9d047acbcc adding a new package to run vm tests in cts-tf
Change-Id: I523860b4e73b11cc158706a30e6694d9188a6697
2011-04-27 19:50:25 -07:00
Brian Carlstrom
bb7c6d88c6 Tracking merge of dalvik-dev to master
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
2011-04-01 15:45:58 -07:00
Brett Chabot
e847a39956 Build cts-tradefed README into cts.zip
Change-Id: Idd2d36a021eb706846673a1ebc417a1f4c3b9d38
2011-02-18 15:13:50 -08:00
Brett Chabot
2aad7a5bea Merge "Add cts-tradefed to cts build." into honeycomb 2011-01-31 13:42:11 -08:00
Brett Chabot
358b24700b Add cts-tradefed to cts build.
Bug 3403768

Change-Id: I0ca2068f93f25b2f5f6691c5ce70573da4a12aa6
2011-01-31 12:57:56 -08:00
Jean-Baptiste Queru
e0d4dbad5a am a4781e86: Merge from open-source gingerbread
* commit 'a4781e867f2e9115ce5b8085576bebf6505bfd00':
  CTS: pass vogar expectation location to CollectAllTests.
2011-01-29 09:27:39 -08:00
Brett Chabot
fdb400cf20 CTS: pass vogar expectation location to CollectAllTests.
Bug 3181338

Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658
2011-01-07 16:19:02 -08:00
Brian Muramatsu
1cf9e0ef16 Change from @ to $(hide) in CTS Build
Change-Id: Ibda485105f750e971260088785904ea420cbaa03
2010-12-06 12:49:13 -08:00
Brett Chabot
3bab7f036c am 6e644e14: am ebf4b519: cherry pick \'CTS vm-tests depend on hostestlib\' into GB. 2010-10-27 18:58:46 -07:00
Brett Chabot
ebf4b5190a cherry pick 'CTS vm-tests depend on hostestlib' into GB.
Original description:
CTS vm-tests now depend on hosttestlib.

Bug 3125713

Conflicts:

	core/tasks/cts.mk

Change-Id: I9e364a9d9d2cae396691921424ca591beca05468
2010-10-27 18:49:33 -07:00
Brian Muramatsu
0dd458e65a am 99185c2a: am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread
Merge commit '99185c2a462d563855e4bc0c1e5649a21b2e186b'

* commit '99185c2a462d563855e4bc0c1e5649a21b2e186b':
  Support Additional CTS Host Jars
2010-10-10 12:51:28 -07:00
Brian Muramatsu
cd7170d7ee resolved conflicts for merge of 0f8fcbe2 to gingerbread
Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
2010-10-07 14:31:21 -07:00
Brian Muramatsu
45a971d961 Support Additional CTS Host Jars
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
2010-10-05 13:44:33 -07:00
Xavier Ducrohet
2daa77ee01 Package ddmlib-prebuilt with CTS.
This ensures that CTS is using a compatible ddmlib.
2010-09-27 17:28:39 -07:00
Brian Carlstrom
7dc35a3b9c Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd3
git cherry-pick --no-commit d05d74b2d6
git cherry-pick --no-commit 5479d77e32

Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
2010-08-04 23:17:47 -07:00
Xavier Ducrohet
c350a66807 am 45270759: am e743c53b: Package ddmlib-prebuilt with CTS.
Merge commit '45270759642c03bdbe39ae261e22160d2c64ecec'

* commit '45270759642c03bdbe39ae261e22160d2c64ecec':
  Package ddmlib-prebuilt with CTS.
2010-07-28 15:17:09 -07:00
Xavier Ducrohet
4527075964 am e743c53b: Package ddmlib-prebuilt with CTS.
Merge commit 'e743c53b88faf35be47667b0252c881c7b32f856' into gingerbread-plus-aosp

* commit 'e743c53b88faf35be47667b0252c881c7b32f856':
  Package ddmlib-prebuilt with CTS.
2010-07-28 15:14:51 -07:00
Xavier Ducrohet
e743c53b88 Package ddmlib-prebuilt with CTS.
This ensures that CTS is using a compatible ddmlib.

Change-Id: Iff6d2bfec873949dfd07ccf758bf257350f11298
2010-07-28 11:07:31 -07:00
The Android Open Source Project
83ef704944 am 4e8e998e: am 989fade3: am af44485f: merge from open-source froyo
Merge commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4'

* commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4':
  Include Test Case List from CTS Project
2010-07-26 12:31:21 -07:00
Brian Muramatsu
fa3d88f884 Include Test Case List from CTS Project
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
2010-07-22 14:46:53 -07:00
Brian Muramatsu
36b332beca Build Accessibility Tests and APK
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
2010-07-08 13:05:09 -07:00
Joe Onorato
8004266329 Require a directory that could actually exist.
Change-Id: I6030a062dc9f6a40ea32ecbb612c2b9353fc1af6
2010-06-15 17:29:19 -04:00
Brian Carlstrom
d05d74b2d6 Fix "make cts" for refactored libcore
Change-Id: I718ee82681a4989205118d3e828567971e5f1849
2010-05-28 22:42:33 -07:00
Brian Carlstrom
b6a08f0cd3 Deleting test builds obsoleted by libcore reorg
Change-Id: Ia8f5984e5ba03d1429c31c48d098cb044305cab1
2010-05-28 17:02:57 -07:00
Svetoslav Ganov
08430d5350 Add CTS tests for the accessibility APIs. (make)
Change-Id: I4cdf7639412e1fcea0f4ee29f79e2868408cf9a1
2010-04-23 17:40:29 -07:00
Brett Chabot
1e43c51075 Add CTS accounts tests to CTS makefile.
Change-Id: If7d87e2deed2036536ad852c382dca0e8bbad87b
2009-12-17 15:14:40 -08:00
Dan Bornstein
bb0c8804dd Add Bluetooth to the test list.
Change-Id: I1e18b76c87a7bba5ef3b4db8ac763bc7d9b6aac6
2009-11-20 13:13:41 -08:00
Dan Bornstein
01833fba3b Add the JNI test to the CTS list.
Change-Id: I60b2633b98ccb06551e521ff229ed12c897cc2e6
2009-11-18 17:27:10 -08:00
Brett Chabot
2779fa7d9f Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Bug 2099347

Change-Id: Ica876daca8993e8f6eefda6f1a733dcadc92f292
2009-11-18 14:40:54 -08:00
Dan Bornstein
1347f92e3a Add the example test to the CTS.
Change-Id: I392672f1767bf72a18058de49c8658dabdc93a4d
2009-11-17 14:27:40 -08:00
Brett Chabot
45dc54f680 Add speech tests to CTS makefile. 2009-10-08 10:00:37 -07:00
Brett Chabot
30e1f2bdd8 Add dpi tests to CTS. 2009-10-08 10:00:37 -07:00
Brett Chabot
759901fa6d Add Gesture tests to CTS. 2009-08-24 17:30:41 -07:00
Phil Dubach
793817baa1 CTS: Add missing make dependencies for application security tests
Change-Id: I4d069b18b0da5f49ca9bb377d04732b8222ac137
2009-08-24 15:18:35 -07:00
Phil Dubach
3b7521b524 CTS: Add application security tests to makefile
Change-Id: I51291d338cca88fed68247efbecbaf747306c6b7
2009-08-24 11:49:39 -07:00
Phil Dubach
5e3ab04d97 CTS: Enable Python description/plan generator
This enables the new description/plan generator added in change
21366.
2009-08-19 17:03:21 -07:00