Commit Graph

32 Commits

Author SHA1 Message Date
Treehugger Robot
3dd45cab17 Merge "Allow compatibility suite also build a test list" am: 7fe5450be2 am: 30e367dbb4 am: 4d15c8b486
Original change: https://android-review.googlesource.com/c/platform/build/+/1844555

Bug: 201591516
Change-Id: Id124e6eb6d5c8c0ec31aca6b5878577519125c30
(cherry picked from commit 10218c724d)
2021-10-29 21:43:12 +00:00
jschung
904e1735c8 Include android-gts/lib folder in android-gts.zip
Some gts tests such as JniUncompressGtsTestCases need native libraries
and those should be located under android-gts/lib.

Test: confirmed that the android-gts.zip includes lib folder
Bug: 186595833
Change-Id: I7d0605d0aff861059e3788630585e9ba412f9cac
2021-04-29 16:32:47 +09:00
Julien Desprez
67e5ec6202 Remove unit tests jar from suites
Remove unit tests jar from official suite packaging
they will be run & tested externally as real unit tests.

Include the compatiblity-tradefed.jar element as it will
be needed.

Test: make cts; run cts-unit-tests
Bug: 173811050
Change-Id: Ie808c7422e35c48c9392f7179806745ef392de64
2020-11-24 13:20:04 -08:00
Dan Shi
413a53066b Make *TS to include NOTICE file by default
Bug: 170487545
Test: none
Change-Id: Ib3f726b847bc2123f0b564d0c3a8f5584720c021
2020-10-22 21:29:37 -07:00
Julien Desprez
8d5158fdf0 Remove the hosttestlib.jar as it shouldn't be needed
This jar is not needed anymore

Test: make cts
Bug: 171326035
Change-Id: Idb4a6ff0b848b3d813bc0aba97ce9214a9532f44
2020-10-20 13:22:43 -07:00
Colin Cross
fa4f72000b Package the JDK into test suite zips
Allow hermetically running the test suites by packaging the JDK
into the output zip file.

Bug: 139202337
Test: m cts && zipinfo out/host/linux-x86/cts/android-cts.zip
Change-Id: I6a59bb97a33113c83df9c7162e9c65ca90a8c196
2020-08-11 23:35:56 +00:00
wangzhou
23acb0b896 Combine HOST/TARGET in Test Suite NOTICE.
This improved NOTICE bundling now includes TARGET_OUT deps that Android
Test Suites packages need, especially those for .apk files.

Bug: b/141258651
Test: $ make cts && \
        unzip -p out/host/linux-x86/cts/android-cts.zip \
        android-cts/NOTICE.txt \
        | less -N
Change-Id: I4c84d194ff5982fc57b6a8097602d4a9df68d61c
Merged-In: I4c84d194ff5982fc57b6a8097602d4a9df68d61c
(cherry picked from commit e73186d2ac)
2020-08-06 12:07:40 -07:00
wangzhou
e7f1725938 Build NOTICE txt file into TestSuite zip package.
- the NOTICE file is only taken from out/host.
- currently only enabled from cts by setting flag "test_suite_notice"

Test: $ make cts && unzip -l \
        out/host/linux-x86/cts/android-cts.zip \
        | grep NOTICE
      $ make pts && \ unzip -l \
        out/host/linux-x86/cts/android-cts.zip \
        | grep NOTICE
Bug: b/141258651
Change-Id: I696b424e5f2b09d28d53ccbd9198e1f4f301ec01
Merged-In: I696b424e5f2b09d28d53ccbd9198e1f4f301ec01
(cherry picked from commit 93d2fbbcad)
2020-08-06 12:07:40 -07:00
Julien Desprez
b8f37694a3 Add new jar that will replace tradefed.jar
for compatibility with across branches, still need to
export tradefed.jar.

Test: make cts
Bug: 149758913
Change-Id: I101cba5dc3abe483b4dfbe6a113e24960e0e07ba
2020-07-09 15:31:35 -07:00
Julien Desprez
fae54cbd8a Add tradefed-test-framework to the suites exported jar
New jar that needs to be packaged for suites.

Test: make cts
Bug: 149758913
Change-Id: If29508f3dd30939be603ed03f2536c960ca40d92
2020-05-18 13:30:29 -07:00
Dan Shi
6a619b8d85 Include shared host liraries in test suite zip
Bug: 151194160
Test: m -j vts && \
  ls out/host/linux-x86/vts/android-vts/testcases/lib64/
Change-Id: I7ebc4bf392d4c0f27478607846974631390097f8
2020-04-13 09:29:16 -07:00
Peter Collingbourne
bbddfcf7ba Only include the "tools" and "testcases" subdirectories in android-cts.zip.
Without this, we can end up packaging log files from previous CTS runs in
the zip file. If the names of those log files contain whitespace characters,
it can result in a build failure.

Change-Id: Id96d1915a03b6a715acfdc212c9b2d6f28045baa
2019-08-21 12:31:41 -07:00
Dan Willemsen
288bedfc8f Convert more uses of $(ACP) to cp
Test: treehugger
Change-Id: Id8365ce4c06dfe731be9b80f805e071fab522909
2019-05-28 15:36:47 -07:00
Julien Desprez
e483544cf5 Remove host proto lib from cts jars
The lib is already statically included in tradefed.jar.

Test: run cts-unit-tests
Bug: 118297021
Change-Id: I073b68216870b1e744ee35db82a7e03f11db6782
2018-10-23 09:38:09 -07:00
Julien Desprez
5ec361fff6 Merge "Add a version.txt file to compatibility suite zips"
am: aa2abc3324

Change-Id: I6775b48c36b323c2b7f502acb0a2e12fed04f4c9
2018-07-26 15:09:09 -07:00
Julien Desprez
7a10601e7c Add a version.txt file to compatibility suite zips
This will avoid having to tag jar file with a manifest
implementation version.

Test: make cts, check the zip
Bug: 111834256
Change-Id: Id809217cefb36b4779fdf41c02f5809ba22d03a1
2018-07-26 11:47:46 -07:00
Julien Desprez
5b9602634b Merge "Add loganalysis to cts" am: ee9ea1d601
am: 6d948a6cf5

Change-Id: Id523f239f07720b131a175f61118878b591a1ca0
2018-03-20 03:10:14 +00:00
jdesprez
4619031efe Add loganalysis to cts
Tradefed depends on Loganalysis so it should also be part
of cts. Luckily there was no overlap (cts never called a
part of TF that use loganalysis) so it never failed
with classNotFound before.

Test: build cts
Bug: 75979908
Change-Id: I2542ecd077149f7165aff120d67054943df20b54
2018-03-19 16:47:22 -07:00
Siyuan Zhou
1888315487 Added test suite specific libs.
Change-Id: Iab18a8c0e118c957f8ee3dfa258d3a72351ce4db
2017-11-28 10:31:40 -08:00
Todd Lee
bae7ee5d9e add support for test suites with 'prebuilt tools'
- prebuilt tools copied directly to /tools subdir of zip
- currently only used by wts, noop for other suites

Bug: b/62102556
Change-Id: I796d7490f39f817af8f2ec5bea86593182bfcbe2
2017-06-09 17:58:51 +00:00
Dan Willemsen
ff490b6763 Merge "Speed up *TS zip file creation" am: 6d0f949296 am: 83667a3821
am: d6f077092b

Change-Id: Icf328eb0c239b7bd0a0ba602490860cad02f56db
2017-03-13 20:07:18 +00:00
Dan Willemsen
c4cf49569f Speed up *TS zip file creation
This also makes the resulting zip files more repeatable -- the file list
is sorted and the entries have static timestamps.

On my machine, this saves ~30 seconds for android-cts.zip, it now takes
less than a second.

Test: m -j cts; compare output from without this change
Change-Id: Ia71e35878ff98ba9775115860530e87eee47739f
2017-03-10 13:39:26 -08:00
Joe Onorato
9aa0b89177 make protobuf available to CTS host tools
Test: make -j32 cts
Change-Id: I866aebd6313fe2b0b6d3a1876ac8e5ada473a7b0
2016-12-20 22:28:54 -08:00
Stuart Scott
270faa62e1 Remove tradefed prebuilt dependancy
Test: make cts
Change-Id: I6d75e9e8ca0f4327c0e6e1203d9009359d3819b8
2016-11-22 15:12:35 -08:00
Julien Desprez
63d377c56b Build CTS out of TF source
Export the TF jar build from source to the cts zip.

Test: build cts
Bug: 32819381
Change-Id: I4e1ccbd3a7ea27998a95986c1dd0348e01da60b6
2016-11-11 12:12:06 +00:00
Julien Desprez
7b10950b8a Export the cts tests jar required to run unit tests
Bug: 31393228
Change-Id: Id5ce5beccd70c67be6d4bfed01f7206a48498fc2
2016-09-12 11:19:48 +01:00
Aaron Holden
aee6f602f9 Move suite-level dynamic config to testcases
Enable client-side dynamic config code to access the suite-level dynamic
config files by placing them in the testcases directory. Also update
cts_v2.mk to define the location of its corresponding dynamic config file.

bug:23625592
Change-Id: Id11dea4b6acbe8ea7e5e9579e369a2be5873a224
2015-12-16 12:32:57 -08:00
Stuart Scott
6661a29e6d Compatibility build rule rather than library.
bug:21762834
Change-Id: I8be2a5d0669dd80c2b17d31b655ec424bc1d9f63
2015-09-01 14:27:52 -07:00
Stuart Scott
19324d1a06 Depend on compatibility-host-util
bug:21762834
Change-Id: I8a91361b1b0dcf0ab98e15049ababea153f0e36a
2015-07-23 12:56:51 -07:00
Stuart Scott
3a0374548a Remove repository directory.
We no longer have plans as xml files, so this extra directory level is
unnecessary.

Change-Id: Id513685d60c4abee2932a31bb89a2a518a285270
2015-06-10 15:28:08 -07:00
Stuart Scott
1dcff84ce6 Only copy tools, not test artifacts
Change-Id: I723f580a6cea783dc07d12883dfe36120e462784
2015-06-08 16:19:27 -07:00
Stuart Scott
1926e9b8bf Adds the compatibility build task and cts_v2 rules.
Change-Id: If7939dba38566f26cbc678da3fe7cb605c19745a
2015-06-04 15:09:47 -07:00