diff options
author | 2023-12-05 12:55:25 -0800 | |
---|---|---|
committer | 2023-12-09 01:10:54 +0000 | |
commit | 1b126bb39fd6681015ea7c0e6f18b757a846d5c7 (patch) | |
tree | 6f7bc41686b6ea8c1875235b994beb9b22df940e | |
parent | 6ce5a502c054bef6f6677ee1779e508a729e9d3e (diff) |
Sandbox art test genrules
A number of art tests have custom build steps that depend on other
files not listed in the srcs of the genrule.
Extend test-metadata.json with a `test_build_srcs` property that can be
used to list sources that will be added to the test data genrule.
Bug: 307824623
Test: mm in art/test and ./build/soong/tests/genrule_sandbox_test.py art-run-test-host-data-shard48-tmp and ./art/test.py --host
Change-Id: I2931bcf03216fef43d31e1baf323a41551981358
-rw-r--r-- | test/1018-placeholder/Android.bp | 40 | ||||
-rw-r--r-- | test/1018-placeholder/expected-stderr.txt | 0 | ||||
-rw-r--r-- | test/1018-placeholder/expected-stdout.txt | 0 | ||||
-rw-r--r-- | test/1018-placeholder/info.txt | 4 | ||||
-rw-r--r-- | test/1018-placeholder/src/Main.java | 20 | ||||
-rw-r--r-- | test/Android.run-test.bp | 423 | ||||
-rwxr-xr-x | test/Android.run-test.bp.py | 94 | ||||
-rwxr-xr-x | test/run_test_build.py | 3 |
8 files changed, 490 insertions, 94 deletions
diff --git a/test/1018-placeholder/Android.bp b/test/1018-placeholder/Android.bp new file mode 100644 index 0000000000..02c766d41a --- /dev/null +++ b/test/1018-placeholder/Android.bp @@ -0,0 +1,40 @@ +// Generated by `regen-test-files`. Do not edit manually. + +// Build rules for ART run-test `1018-placeholder`. + +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "art_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["art_license"], +} + +// Test's Dex code. +java_test { + name: "art-run-test-1018-placeholder", + defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", + srcs: ["src/**/*.java"], + data: [ + ":art-run-test-1018-placeholder-expected-stdout", + ":art-run-test-1018-placeholder-expected-stderr", + ], +} + +// Test's expected standard output. +genrule { + name: "art-run-test-1018-placeholder-expected-stdout", + out: ["art-run-test-1018-placeholder-expected-stdout.txt"], + srcs: ["expected-stdout.txt"], + cmd: "cp -f $(in) $(out)", +} + +// Test's expected standard error. +genrule { + name: "art-run-test-1018-placeholder-expected-stderr", + out: ["art-run-test-1018-placeholder-expected-stderr.txt"], + srcs: ["expected-stderr.txt"], + cmd: "cp -f $(in) $(out)", +} diff --git a/test/1018-placeholder/expected-stderr.txt b/test/1018-placeholder/expected-stderr.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test/1018-placeholder/expected-stderr.txt diff --git a/test/1018-placeholder/expected-stdout.txt b/test/1018-placeholder/expected-stdout.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test/1018-placeholder/expected-stdout.txt diff --git a/test/1018-placeholder/info.txt b/test/1018-placeholder/info.txt new file mode 100644 index 0000000000..724a713d27 --- /dev/null +++ b/test/1018-placeholder/info.txt @@ -0,0 +1,4 @@ +Android.run-test.bp uses ?18-*/**/* and ??18-*/**/* wildcards to glob the tests in its shard, +and then passes them to run_test_build.py using $(locations). $(locations) doesn't accept +modules/globs that don't produce any files. There were previously no tests >1000 that end in 18, +so this one was added just to satisfy the glob. diff --git a/test/1018-placeholder/src/Main.java b/test/1018-placeholder/src/Main.java new file mode 100644 index 0000000000..3486866a2a --- /dev/null +++ b/test/1018-placeholder/src/Main.java @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +public class Main { + public static void main(String args[]) { + } +} diff --git a/test/Android.run-test.bp b/test/Android.run-test.bp index 274c270945..6a1bd72567 100644 --- a/test/Android.run-test.bp +++ b/test/Android.run-test.bp @@ -1,6 +1,15 @@ // This file was generated by Android.run-test.bp.py // It is not necessary to regenerate it when tests are added/removed/modified. +TEST_BUILD_COMMON_ARGS = "$(location run_test_build.py) --out $(out) " + + "--bootclasspath $(location :art-run-test-bootclasspath) " + + "--d8 $(location d8) " + + "--jasmin $(location jasmin) " + + "--rewrapper $(location rewrapper) " + + "--smali $(location android-smali) " + + "--soong_zip $(location soong_zip) " + + "--zipalign $(location zipalign) " + java_genrule { name: "art-run-test-host-data-shard00-tmp", out: ["art-run-test-host-data-shard00.zip"], @@ -8,6 +17,7 @@ java_genrule { "?00-*/**/*", "??00-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?00-*/**/*) $(locations ??00-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -27,6 +37,7 @@ java_genrule { "?01-*/**/*", "??01-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?01-*/**/*) $(locations ??01-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -46,6 +57,7 @@ java_genrule { "?02-*/**/*", "??02-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?02-*/**/*) $(locations ??02-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -65,6 +77,7 @@ java_genrule { "?03-*/**/*", "??03-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?03-*/**/*) $(locations ??03-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -84,6 +97,7 @@ java_genrule { "?04-*/**/*", "??04-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?04-*/**/*) $(locations ??04-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -103,6 +117,7 @@ java_genrule { "?05-*/**/*", "??05-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?05-*/**/*) $(locations ??05-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -122,6 +137,7 @@ java_genrule { "?06-*/**/*", "??06-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?06-*/**/*) $(locations ??06-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -141,6 +157,7 @@ java_genrule { "?07-*/**/*", "??07-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?07-*/**/*) $(locations ??07-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -160,6 +177,7 @@ java_genrule { "?08-*/**/*", "??08-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?08-*/**/*) $(locations ??08-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -179,6 +197,7 @@ java_genrule { "?09-*/**/*", "??09-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?09-*/**/*) $(locations ??09-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -198,6 +217,7 @@ java_genrule { "?10-*/**/*", "??10-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?10-*/**/*) $(locations ??10-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -217,6 +237,7 @@ java_genrule { "?11-*/**/*", "??11-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?11-*/**/*) $(locations ??11-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -236,6 +257,7 @@ java_genrule { "?12-*/**/*", "??12-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?12-*/**/*) $(locations ??12-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -255,6 +277,7 @@ java_genrule { "?13-*/**/*", "??13-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?13-*/**/*) $(locations ??13-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -274,6 +297,7 @@ java_genrule { "?14-*/**/*", "??14-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?14-*/**/*) $(locations ??14-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -293,6 +317,7 @@ java_genrule { "?15-*/**/*", "??15-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?15-*/**/*) $(locations ??15-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -312,6 +337,7 @@ java_genrule { "?16-*/**/*", "??16-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?16-*/**/*) $(locations ??16-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -331,6 +357,7 @@ java_genrule { "?17-*/**/*", "??17-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?17-*/**/*) $(locations ??17-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -350,6 +377,7 @@ java_genrule { "?18-*/**/*", "??18-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?18-*/**/*) $(locations ??18-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -369,6 +397,7 @@ java_genrule { "?19-*/**/*", "??19-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?19-*/**/*) $(locations ??19-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -388,6 +417,7 @@ java_genrule { "?20-*/**/*", "??20-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?20-*/**/*) $(locations ??20-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -407,6 +437,7 @@ java_genrule { "?21-*/**/*", "??21-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?21-*/**/*) $(locations ??21-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -426,6 +457,7 @@ java_genrule { "?22-*/**/*", "??22-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?22-*/**/*) $(locations ??22-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -445,6 +477,7 @@ java_genrule { "?23-*/**/*", "??23-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?23-*/**/*) $(locations ??23-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -464,6 +497,7 @@ java_genrule { "?24-*/**/*", "??24-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?24-*/**/*) $(locations ??24-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -483,6 +517,7 @@ java_genrule { "?25-*/**/*", "??25-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?25-*/**/*) $(locations ??25-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -502,6 +537,7 @@ java_genrule { "?26-*/**/*", "??26-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?26-*/**/*) $(locations ??26-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -521,6 +557,7 @@ java_genrule { "?27-*/**/*", "??27-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?27-*/**/*) $(locations ??27-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -540,6 +577,7 @@ java_genrule { "?28-*/**/*", "??28-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?28-*/**/*) $(locations ??28-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -559,6 +597,7 @@ java_genrule { "?29-*/**/*", "??29-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?29-*/**/*) $(locations ??29-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -578,6 +617,7 @@ java_genrule { "?30-*/**/*", "??30-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?30-*/**/*) $(locations ??30-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -597,6 +637,7 @@ java_genrule { "?31-*/**/*", "??31-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?31-*/**/*) $(locations ??31-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -616,6 +657,7 @@ java_genrule { "?32-*/**/*", "??32-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?32-*/**/*) $(locations ??32-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -635,6 +677,7 @@ java_genrule { "?33-*/**/*", "??33-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?33-*/**/*) $(locations ??33-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -654,6 +697,7 @@ java_genrule { "?34-*/**/*", "??34-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?34-*/**/*) $(locations ??34-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -673,6 +717,7 @@ java_genrule { "?35-*/**/*", "??35-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?35-*/**/*) $(locations ??35-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -692,6 +737,7 @@ java_genrule { "?36-*/**/*", "??36-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?36-*/**/*) $(locations ??36-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -711,6 +757,7 @@ java_genrule { "?37-*/**/*", "??37-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?37-*/**/*) $(locations ??37-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -730,6 +777,7 @@ java_genrule { "?38-*/**/*", "??38-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?38-*/**/*) $(locations ??38-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -749,6 +797,7 @@ java_genrule { "?39-*/**/*", "??39-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?39-*/**/*) $(locations ??39-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -768,6 +817,7 @@ java_genrule { "?40-*/**/*", "??40-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?40-*/**/*) $(locations ??40-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -787,6 +837,7 @@ java_genrule { "?41-*/**/*", "??41-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?41-*/**/*) $(locations ??41-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -806,6 +857,7 @@ java_genrule { "?42-*/**/*", "??42-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?42-*/**/*) $(locations ??42-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -825,6 +877,7 @@ java_genrule { "?43-*/**/*", "??43-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?43-*/**/*) $(locations ??43-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -844,6 +897,7 @@ java_genrule { "?44-*/**/*", "??44-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?44-*/**/*) $(locations ??44-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -863,6 +917,7 @@ java_genrule { "?45-*/**/*", "??45-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?45-*/**/*) $(locations ??45-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -882,6 +937,7 @@ java_genrule { "?46-*/**/*", "??46-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?46-*/**/*) $(locations ??46-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -901,6 +957,7 @@ java_genrule { "?47-*/**/*", "??47-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?47-*/**/*) $(locations ??47-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -920,6 +977,7 @@ java_genrule { "?48-*/**/*", "??48-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?48-*/**/*) $(locations ??48-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -939,6 +997,7 @@ java_genrule { "?49-*/**/*", "??49-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?49-*/**/*) $(locations ??49-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -958,6 +1017,7 @@ java_genrule { "?50-*/**/*", "??50-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?50-*/**/*) $(locations ??50-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -977,6 +1037,7 @@ java_genrule { "?51-*/**/*", "??51-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?51-*/**/*) $(locations ??51-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -996,6 +1057,7 @@ java_genrule { "?52-*/**/*", "??52-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?52-*/**/*) $(locations ??52-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1015,6 +1077,7 @@ java_genrule { "?53-*/**/*", "??53-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?53-*/**/*) $(locations ??53-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1034,6 +1097,7 @@ java_genrule { "?54-*/**/*", "??54-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?54-*/**/*) $(locations ??54-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1053,6 +1117,7 @@ java_genrule { "?55-*/**/*", "??55-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?55-*/**/*) $(locations ??55-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1072,6 +1137,7 @@ java_genrule { "?56-*/**/*", "??56-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?56-*/**/*) $(locations ??56-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1091,6 +1157,7 @@ java_genrule { "?57-*/**/*", "??57-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?57-*/**/*) $(locations ??57-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1110,6 +1177,7 @@ java_genrule { "?58-*/**/*", "??58-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?58-*/**/*) $(locations ??58-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1129,6 +1197,7 @@ java_genrule { "?59-*/**/*", "??59-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?59-*/**/*) $(locations ??59-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1148,6 +1217,7 @@ java_genrule { "?60-*/**/*", "??60-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?60-*/**/*) $(locations ??60-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1167,6 +1237,7 @@ java_genrule { "?61-*/**/*", "??61-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?61-*/**/*) $(locations ??61-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1186,6 +1257,7 @@ java_genrule { "?62-*/**/*", "??62-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?62-*/**/*) $(locations ??62-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1205,6 +1277,7 @@ java_genrule { "?63-*/**/*", "??63-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?63-*/**/*) $(locations ??63-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1224,6 +1297,7 @@ java_genrule { "?64-*/**/*", "??64-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?64-*/**/*) $(locations ??64-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1243,6 +1317,7 @@ java_genrule { "?65-*/**/*", "??65-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?65-*/**/*) $(locations ??65-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1262,6 +1337,7 @@ java_genrule { "?66-*/**/*", "??66-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?66-*/**/*) $(locations ??66-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1281,6 +1357,7 @@ java_genrule { "?67-*/**/*", "??67-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?67-*/**/*) $(locations ??67-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1300,6 +1377,7 @@ java_genrule { "?68-*/**/*", "??68-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?68-*/**/*) $(locations ??68-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1319,6 +1397,7 @@ java_genrule { "?69-*/**/*", "??69-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?69-*/**/*) $(locations ??69-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1338,6 +1417,7 @@ java_genrule { "?70-*/**/*", "??70-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?70-*/**/*) $(locations ??70-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1357,6 +1437,7 @@ java_genrule { "?71-*/**/*", "??71-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?71-*/**/*) $(locations ??71-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1376,6 +1457,7 @@ java_genrule { "?72-*/**/*", "??72-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?72-*/**/*) $(locations ??72-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1395,6 +1477,7 @@ java_genrule { "?73-*/**/*", "??73-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?73-*/**/*) $(locations ??73-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1414,6 +1497,7 @@ java_genrule { "?74-*/**/*", "??74-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?74-*/**/*) $(locations ??74-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1433,6 +1517,7 @@ java_genrule { "?75-*/**/*", "??75-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?75-*/**/*) $(locations ??75-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1452,6 +1537,7 @@ java_genrule { "?76-*/**/*", "??76-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?76-*/**/*) $(locations ??76-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1471,6 +1557,7 @@ java_genrule { "?77-*/**/*", "??77-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?77-*/**/*) $(locations ??77-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1490,6 +1577,7 @@ java_genrule { "?78-*/**/*", "??78-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?78-*/**/*) $(locations ??78-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1509,6 +1597,7 @@ java_genrule { "?79-*/**/*", "??79-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?79-*/**/*) $(locations ??79-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1528,6 +1617,7 @@ java_genrule { "?80-*/**/*", "??80-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?80-*/**/*) $(locations ??80-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1547,6 +1637,7 @@ java_genrule { "?81-*/**/*", "??81-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?81-*/**/*) $(locations ??81-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1566,6 +1657,7 @@ java_genrule { "?82-*/**/*", "??82-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?82-*/**/*) $(locations ??82-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1585,6 +1677,7 @@ java_genrule { "?83-*/**/*", "??83-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?83-*/**/*) $(locations ??83-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1604,6 +1697,7 @@ java_genrule { "?84-*/**/*", "??84-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?84-*/**/*) $(locations ??84-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1623,6 +1717,7 @@ java_genrule { "?85-*/**/*", "??85-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?85-*/**/*) $(locations ??85-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1642,6 +1737,7 @@ java_genrule { "?86-*/**/*", "??86-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?86-*/**/*) $(locations ??86-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1661,6 +1757,7 @@ java_genrule { "?87-*/**/*", "??87-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?87-*/**/*) $(locations ??87-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1680,6 +1777,7 @@ java_genrule { "?88-*/**/*", "??88-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?88-*/**/*) $(locations ??88-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1699,6 +1797,7 @@ java_genrule { "?89-*/**/*", "??89-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?89-*/**/*) $(locations ??89-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1718,6 +1817,7 @@ java_genrule { "?90-*/**/*", "??90-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?90-*/**/*) $(locations ??90-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1737,6 +1837,7 @@ java_genrule { "?91-*/**/*", "??91-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?91-*/**/*) $(locations ??91-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1756,6 +1857,7 @@ java_genrule { "?92-*/**/*", "??92-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?92-*/**/*) $(locations ??92-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1775,6 +1877,7 @@ java_genrule { "?93-*/**/*", "??93-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?93-*/**/*) $(locations ??93-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1794,6 +1897,7 @@ java_genrule { "?94-*/**/*", "??94-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?94-*/**/*) $(locations ??94-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1813,6 +1917,7 @@ java_genrule { "?95-*/**/*", "??95-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?95-*/**/*) $(locations ??95-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1832,6 +1937,7 @@ java_genrule { "?96-*/**/*", "??96-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?96-*/**/*) $(locations ??96-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1851,6 +1957,7 @@ java_genrule { "?97-*/**/*", "??97-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?97-*/**/*) $(locations ??97-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1870,6 +1977,7 @@ java_genrule { "?98-*/**/*", "??98-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?98-*/**/*) $(locations ??98-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1889,6 +1997,7 @@ java_genrule { "?99-*/**/*", "??99-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode host $(locations ?99-*/**/*) $(locations ??99-*/**/*)", defaults: ["art-run-test-host-data-defaults"], } @@ -1910,15 +2019,7 @@ java_genrule { ], defaults: ["art-run-test-host-data-defaults"], tools: ["hiddenapi"], - cmd: "$(location run_test_build.py) --out $(out) --mode host " + - "--bootclasspath $(location :art-run-test-bootclasspath) " + - "--d8 $(location d8) " + - "--hiddenapi $(location hiddenapi) " + - "--jasmin $(location jasmin) " + - "--smali $(location android-smali) " + - "--soong_zip $(location soong_zip) " + - "--zipalign $(location zipalign) " + - "$(in)", + cmd: TEST_BUILD_COMMON_ARGS + "--hiddenapi $(location hiddenapi) --mode host $(locations ???-*hiddenapi*/**/*) $(locations ????-*hiddenapi*/**/*)", } // Install in the output directory to make it accessible for tests. @@ -1941,21 +2042,31 @@ genrule_defaults { "run_test_build.py", ":art-run-test-bootclasspath", ], + srcs: [ + // Since genrules are sandboxed, all the sources they use must be listed in + // the Android.bp file. Some tests have symlinks to files from other tests, and + // those must also be listed to avoid a dangling symlink in the sandbox. + "jvmti-common/*.java", + "utils/python/**/*.py", + ":development_docs", + ":asm-9.2-filegroup", + ":ojluni-AbstractCollection", + "988-method-trace/expected-stdout.txt", + "988-method-trace/expected-stderr.txt", + "988-method-trace/src/art/Test988Intrinsics.java", + "988-method-trace/src/art/Test988.java", + "988-method-trace/trace_fib.cc", + "1953-pop-frame/src/art/Test1953.java", + "1953-pop-frame/src/art/SuspendEvents.java", + ], tools: [ + "android-smali", "d8", "jasmin", - "android-smali", + "rewrapper", "soong_zip", "zipalign", ], - cmd: "$(location run_test_build.py) --out $(out) --mode host " + - "--bootclasspath $(location :art-run-test-bootclasspath) " + - "--d8 $(location d8) " + - "--jasmin $(location jasmin) " + - "--smali $(location android-smali) " + - "--soong_zip $(location soong_zip) " + - "--zipalign $(location zipalign) " + - "$(in)", } java_genrule { @@ -2415,6 +2526,7 @@ java_genrule { "?00-*/**/*", "??00-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?00-*/**/*) $(locations ??00-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2434,6 +2546,7 @@ java_genrule { "?01-*/**/*", "??01-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?01-*/**/*) $(locations ??01-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2453,6 +2566,7 @@ java_genrule { "?02-*/**/*", "??02-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?02-*/**/*) $(locations ??02-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2472,6 +2586,7 @@ java_genrule { "?03-*/**/*", "??03-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?03-*/**/*) $(locations ??03-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2491,6 +2606,7 @@ java_genrule { "?04-*/**/*", "??04-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?04-*/**/*) $(locations ??04-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2510,6 +2626,7 @@ java_genrule { "?05-*/**/*", "??05-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?05-*/**/*) $(locations ??05-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2529,6 +2646,7 @@ java_genrule { "?06-*/**/*", "??06-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?06-*/**/*) $(locations ??06-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2548,6 +2666,7 @@ java_genrule { "?07-*/**/*", "??07-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?07-*/**/*) $(locations ??07-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2567,6 +2686,7 @@ java_genrule { "?08-*/**/*", "??08-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?08-*/**/*) $(locations ??08-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2586,6 +2706,7 @@ java_genrule { "?09-*/**/*", "??09-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?09-*/**/*) $(locations ??09-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2605,6 +2726,7 @@ java_genrule { "?10-*/**/*", "??10-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?10-*/**/*) $(locations ??10-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2624,6 +2746,7 @@ java_genrule { "?11-*/**/*", "??11-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?11-*/**/*) $(locations ??11-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2643,6 +2766,7 @@ java_genrule { "?12-*/**/*", "??12-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?12-*/**/*) $(locations ??12-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2662,6 +2786,7 @@ java_genrule { "?13-*/**/*", "??13-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?13-*/**/*) $(locations ??13-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2681,6 +2806,7 @@ java_genrule { "?14-*/**/*", "??14-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?14-*/**/*) $(locations ??14-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2700,6 +2826,7 @@ java_genrule { "?15-*/**/*", "??15-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?15-*/**/*) $(locations ??15-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2719,6 +2846,7 @@ java_genrule { "?16-*/**/*", "??16-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?16-*/**/*) $(locations ??16-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2738,6 +2866,7 @@ java_genrule { "?17-*/**/*", "??17-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?17-*/**/*) $(locations ??17-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2757,6 +2886,7 @@ java_genrule { "?18-*/**/*", "??18-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?18-*/**/*) $(locations ??18-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2776,6 +2906,7 @@ java_genrule { "?19-*/**/*", "??19-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?19-*/**/*) $(locations ??19-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2795,6 +2926,7 @@ java_genrule { "?20-*/**/*", "??20-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?20-*/**/*) $(locations ??20-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2814,6 +2946,7 @@ java_genrule { "?21-*/**/*", "??21-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?21-*/**/*) $(locations ??21-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2833,6 +2966,7 @@ java_genrule { "?22-*/**/*", "??22-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?22-*/**/*) $(locations ??22-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2852,6 +2986,7 @@ java_genrule { "?23-*/**/*", "??23-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?23-*/**/*) $(locations ??23-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2871,6 +3006,7 @@ java_genrule { "?24-*/**/*", "??24-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?24-*/**/*) $(locations ??24-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2890,6 +3026,7 @@ java_genrule { "?25-*/**/*", "??25-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?25-*/**/*) $(locations ??25-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2909,6 +3046,7 @@ java_genrule { "?26-*/**/*", "??26-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?26-*/**/*) $(locations ??26-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2928,6 +3066,7 @@ java_genrule { "?27-*/**/*", "??27-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?27-*/**/*) $(locations ??27-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2947,6 +3086,7 @@ java_genrule { "?28-*/**/*", "??28-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?28-*/**/*) $(locations ??28-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2966,6 +3106,7 @@ java_genrule { "?29-*/**/*", "??29-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?29-*/**/*) $(locations ??29-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -2985,6 +3126,7 @@ java_genrule { "?30-*/**/*", "??30-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?30-*/**/*) $(locations ??30-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3004,6 +3146,7 @@ java_genrule { "?31-*/**/*", "??31-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?31-*/**/*) $(locations ??31-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3023,6 +3166,7 @@ java_genrule { "?32-*/**/*", "??32-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?32-*/**/*) $(locations ??32-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3042,6 +3186,7 @@ java_genrule { "?33-*/**/*", "??33-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?33-*/**/*) $(locations ??33-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3061,6 +3206,7 @@ java_genrule { "?34-*/**/*", "??34-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?34-*/**/*) $(locations ??34-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3080,6 +3226,7 @@ java_genrule { "?35-*/**/*", "??35-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?35-*/**/*) $(locations ??35-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3099,6 +3246,7 @@ java_genrule { "?36-*/**/*", "??36-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?36-*/**/*) $(locations ??36-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3118,6 +3266,7 @@ java_genrule { "?37-*/**/*", "??37-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?37-*/**/*) $(locations ??37-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3137,6 +3286,7 @@ java_genrule { "?38-*/**/*", "??38-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?38-*/**/*) $(locations ??38-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3156,6 +3306,7 @@ java_genrule { "?39-*/**/*", "??39-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?39-*/**/*) $(locations ??39-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3175,6 +3326,7 @@ java_genrule { "?40-*/**/*", "??40-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?40-*/**/*) $(locations ??40-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3194,6 +3346,7 @@ java_genrule { "?41-*/**/*", "??41-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?41-*/**/*) $(locations ??41-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3213,6 +3366,7 @@ java_genrule { "?42-*/**/*", "??42-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?42-*/**/*) $(locations ??42-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3232,6 +3386,7 @@ java_genrule { "?43-*/**/*", "??43-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?43-*/**/*) $(locations ??43-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3251,6 +3406,7 @@ java_genrule { "?44-*/**/*", "??44-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?44-*/**/*) $(locations ??44-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3270,6 +3426,7 @@ java_genrule { "?45-*/**/*", "??45-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?45-*/**/*) $(locations ??45-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3289,6 +3446,7 @@ java_genrule { "?46-*/**/*", "??46-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?46-*/**/*) $(locations ??46-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3308,6 +3466,7 @@ java_genrule { "?47-*/**/*", "??47-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?47-*/**/*) $(locations ??47-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3327,6 +3486,7 @@ java_genrule { "?48-*/**/*", "??48-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?48-*/**/*) $(locations ??48-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3346,6 +3506,7 @@ java_genrule { "?49-*/**/*", "??49-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?49-*/**/*) $(locations ??49-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3365,6 +3526,7 @@ java_genrule { "?50-*/**/*", "??50-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?50-*/**/*) $(locations ??50-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3384,6 +3546,7 @@ java_genrule { "?51-*/**/*", "??51-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?51-*/**/*) $(locations ??51-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3403,6 +3566,7 @@ java_genrule { "?52-*/**/*", "??52-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?52-*/**/*) $(locations ??52-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3422,6 +3586,7 @@ java_genrule { "?53-*/**/*", "??53-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?53-*/**/*) $(locations ??53-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3441,6 +3606,7 @@ java_genrule { "?54-*/**/*", "??54-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?54-*/**/*) $(locations ??54-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3460,6 +3626,7 @@ java_genrule { "?55-*/**/*", "??55-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?55-*/**/*) $(locations ??55-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3479,6 +3646,7 @@ java_genrule { "?56-*/**/*", "??56-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?56-*/**/*) $(locations ??56-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3498,6 +3666,7 @@ java_genrule { "?57-*/**/*", "??57-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?57-*/**/*) $(locations ??57-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3517,6 +3686,7 @@ java_genrule { "?58-*/**/*", "??58-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?58-*/**/*) $(locations ??58-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3536,6 +3706,7 @@ java_genrule { "?59-*/**/*", "??59-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?59-*/**/*) $(locations ??59-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3555,6 +3726,7 @@ java_genrule { "?60-*/**/*", "??60-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?60-*/**/*) $(locations ??60-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3574,6 +3746,7 @@ java_genrule { "?61-*/**/*", "??61-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?61-*/**/*) $(locations ??61-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3593,6 +3766,7 @@ java_genrule { "?62-*/**/*", "??62-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?62-*/**/*) $(locations ??62-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3612,6 +3786,7 @@ java_genrule { "?63-*/**/*", "??63-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?63-*/**/*) $(locations ??63-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3631,6 +3806,7 @@ java_genrule { "?64-*/**/*", "??64-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?64-*/**/*) $(locations ??64-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3650,6 +3826,7 @@ java_genrule { "?65-*/**/*", "??65-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?65-*/**/*) $(locations ??65-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3669,6 +3846,7 @@ java_genrule { "?66-*/**/*", "??66-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?66-*/**/*) $(locations ??66-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3688,6 +3866,7 @@ java_genrule { "?67-*/**/*", "??67-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?67-*/**/*) $(locations ??67-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3707,6 +3886,7 @@ java_genrule { "?68-*/**/*", "??68-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?68-*/**/*) $(locations ??68-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3726,6 +3906,7 @@ java_genrule { "?69-*/**/*", "??69-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?69-*/**/*) $(locations ??69-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3745,6 +3926,7 @@ java_genrule { "?70-*/**/*", "??70-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?70-*/**/*) $(locations ??70-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3764,6 +3946,7 @@ java_genrule { "?71-*/**/*", "??71-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?71-*/**/*) $(locations ??71-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3783,6 +3966,7 @@ java_genrule { "?72-*/**/*", "??72-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?72-*/**/*) $(locations ??72-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3802,6 +3986,7 @@ java_genrule { "?73-*/**/*", "??73-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?73-*/**/*) $(locations ??73-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3821,6 +4006,7 @@ java_genrule { "?74-*/**/*", "??74-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?74-*/**/*) $(locations ??74-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3840,6 +4026,7 @@ java_genrule { "?75-*/**/*", "??75-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?75-*/**/*) $(locations ??75-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3859,6 +4046,7 @@ java_genrule { "?76-*/**/*", "??76-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?76-*/**/*) $(locations ??76-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3878,6 +4066,7 @@ java_genrule { "?77-*/**/*", "??77-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?77-*/**/*) $(locations ??77-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3897,6 +4086,7 @@ java_genrule { "?78-*/**/*", "??78-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?78-*/**/*) $(locations ??78-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3916,6 +4106,7 @@ java_genrule { "?79-*/**/*", "??79-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?79-*/**/*) $(locations ??79-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3935,6 +4126,7 @@ java_genrule { "?80-*/**/*", "??80-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?80-*/**/*) $(locations ??80-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3954,6 +4146,7 @@ java_genrule { "?81-*/**/*", "??81-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?81-*/**/*) $(locations ??81-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3973,6 +4166,7 @@ java_genrule { "?82-*/**/*", "??82-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?82-*/**/*) $(locations ??82-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -3992,6 +4186,7 @@ java_genrule { "?83-*/**/*", "??83-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?83-*/**/*) $(locations ??83-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4011,6 +4206,7 @@ java_genrule { "?84-*/**/*", "??84-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?84-*/**/*) $(locations ??84-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4030,6 +4226,7 @@ java_genrule { "?85-*/**/*", "??85-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?85-*/**/*) $(locations ??85-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4049,6 +4246,7 @@ java_genrule { "?86-*/**/*", "??86-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?86-*/**/*) $(locations ??86-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4068,6 +4266,7 @@ java_genrule { "?87-*/**/*", "??87-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?87-*/**/*) $(locations ??87-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4087,6 +4286,7 @@ java_genrule { "?88-*/**/*", "??88-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?88-*/**/*) $(locations ??88-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4106,6 +4306,7 @@ java_genrule { "?89-*/**/*", "??89-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?89-*/**/*) $(locations ??89-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4125,6 +4326,7 @@ java_genrule { "?90-*/**/*", "??90-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?90-*/**/*) $(locations ??90-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4144,6 +4346,7 @@ java_genrule { "?91-*/**/*", "??91-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?91-*/**/*) $(locations ??91-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4163,6 +4366,7 @@ java_genrule { "?92-*/**/*", "??92-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?92-*/**/*) $(locations ??92-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4182,6 +4386,7 @@ java_genrule { "?93-*/**/*", "??93-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?93-*/**/*) $(locations ??93-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4201,6 +4406,7 @@ java_genrule { "?94-*/**/*", "??94-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?94-*/**/*) $(locations ??94-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4220,6 +4426,7 @@ java_genrule { "?95-*/**/*", "??95-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?95-*/**/*) $(locations ??95-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4239,6 +4446,7 @@ java_genrule { "?96-*/**/*", "??96-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?96-*/**/*) $(locations ??96-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4258,6 +4466,7 @@ java_genrule { "?97-*/**/*", "??97-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?97-*/**/*) $(locations ??97-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4277,6 +4486,7 @@ java_genrule { "?98-*/**/*", "??98-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?98-*/**/*) $(locations ??98-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4296,6 +4506,7 @@ java_genrule { "?99-*/**/*", "??99-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode target $(locations ?99-*/**/*) $(locations ??99-*/**/*)", defaults: ["art-run-test-target-data-defaults"], } @@ -4317,15 +4528,7 @@ java_genrule { ], defaults: ["art-run-test-target-data-defaults"], tools: ["hiddenapi"], - cmd: "$(location run_test_build.py) --out $(out) --mode target " + - "--bootclasspath $(location :art-run-test-bootclasspath) " + - "--d8 $(location d8) " + - "--hiddenapi $(location hiddenapi) " + - "--jasmin $(location jasmin) " + - "--smali $(location android-smali) " + - "--soong_zip $(location soong_zip) " + - "--zipalign $(location zipalign) " + - "$(in)", + cmd: TEST_BUILD_COMMON_ARGS + "--hiddenapi $(location hiddenapi) --mode target $(locations ???-*hiddenapi*/**/*) $(locations ????-*hiddenapi*/**/*)", } // Install in the output directory to make it accessible for tests. @@ -4348,21 +4551,31 @@ genrule_defaults { "run_test_build.py", ":art-run-test-bootclasspath", ], + srcs: [ + // Since genrules are sandboxed, all the sources they use must be listed in + // the Android.bp file. Some tests have symlinks to files from other tests, and + // those must also be listed to avoid a dangling symlink in the sandbox. + "jvmti-common/*.java", + "utils/python/**/*.py", + ":development_docs", + ":asm-9.2-filegroup", + ":ojluni-AbstractCollection", + "988-method-trace/expected-stdout.txt", + "988-method-trace/expected-stderr.txt", + "988-method-trace/src/art/Test988Intrinsics.java", + "988-method-trace/src/art/Test988.java", + "988-method-trace/trace_fib.cc", + "1953-pop-frame/src/art/Test1953.java", + "1953-pop-frame/src/art/SuspendEvents.java", + ], tools: [ + "android-smali", "d8", "jasmin", - "android-smali", + "rewrapper", "soong_zip", "zipalign", ], - cmd: "$(location run_test_build.py) --out $(out) --mode target " + - "--bootclasspath $(location :art-run-test-bootclasspath) " + - "--d8 $(location d8) " + - "--jasmin $(location jasmin) " + - "--smali $(location android-smali) " + - "--soong_zip $(location soong_zip) " + - "--zipalign $(location zipalign) " + - "$(in)", } java_genrule { @@ -4822,6 +5035,7 @@ java_genrule { "?00-*/**/*", "??00-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?00-*/**/*) $(locations ??00-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -4841,6 +5055,7 @@ java_genrule { "?01-*/**/*", "??01-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?01-*/**/*) $(locations ??01-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -4860,6 +5075,7 @@ java_genrule { "?02-*/**/*", "??02-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?02-*/**/*) $(locations ??02-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -4879,6 +5095,7 @@ java_genrule { "?03-*/**/*", "??03-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?03-*/**/*) $(locations ??03-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -4898,6 +5115,7 @@ java_genrule { "?04-*/**/*", "??04-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?04-*/**/*) $(locations ??04-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -4917,6 +5135,7 @@ java_genrule { "?05-*/**/*", "??05-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?05-*/**/*) $(locations ??05-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -4936,6 +5155,7 @@ java_genrule { "?06-*/**/*", "??06-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?06-*/**/*) $(locations ??06-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -4955,6 +5175,7 @@ java_genrule { "?07-*/**/*", "??07-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?07-*/**/*) $(locations ??07-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -4974,6 +5195,7 @@ java_genrule { "?08-*/**/*", "??08-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?08-*/**/*) $(locations ??08-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -4993,6 +5215,7 @@ java_genrule { "?09-*/**/*", "??09-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?09-*/**/*) $(locations ??09-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5012,6 +5235,7 @@ java_genrule { "?10-*/**/*", "??10-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?10-*/**/*) $(locations ??10-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5031,6 +5255,7 @@ java_genrule { "?11-*/**/*", "??11-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?11-*/**/*) $(locations ??11-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5050,6 +5275,7 @@ java_genrule { "?12-*/**/*", "??12-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?12-*/**/*) $(locations ??12-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5069,6 +5295,7 @@ java_genrule { "?13-*/**/*", "??13-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?13-*/**/*) $(locations ??13-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5088,6 +5315,7 @@ java_genrule { "?14-*/**/*", "??14-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?14-*/**/*) $(locations ??14-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5107,6 +5335,7 @@ java_genrule { "?15-*/**/*", "??15-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?15-*/**/*) $(locations ??15-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5126,6 +5355,7 @@ java_genrule { "?16-*/**/*", "??16-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?16-*/**/*) $(locations ??16-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5145,6 +5375,7 @@ java_genrule { "?17-*/**/*", "??17-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?17-*/**/*) $(locations ??17-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5164,6 +5395,7 @@ java_genrule { "?18-*/**/*", "??18-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?18-*/**/*) $(locations ??18-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5183,6 +5415,7 @@ java_genrule { "?19-*/**/*", "??19-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?19-*/**/*) $(locations ??19-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5202,6 +5435,7 @@ java_genrule { "?20-*/**/*", "??20-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?20-*/**/*) $(locations ??20-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5221,6 +5455,7 @@ java_genrule { "?21-*/**/*", "??21-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?21-*/**/*) $(locations ??21-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5240,6 +5475,7 @@ java_genrule { "?22-*/**/*", "??22-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?22-*/**/*) $(locations ??22-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5259,6 +5495,7 @@ java_genrule { "?23-*/**/*", "??23-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?23-*/**/*) $(locations ??23-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5278,6 +5515,7 @@ java_genrule { "?24-*/**/*", "??24-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?24-*/**/*) $(locations ??24-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5297,6 +5535,7 @@ java_genrule { "?25-*/**/*", "??25-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?25-*/**/*) $(locations ??25-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5316,6 +5555,7 @@ java_genrule { "?26-*/**/*", "??26-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?26-*/**/*) $(locations ??26-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5335,6 +5575,7 @@ java_genrule { "?27-*/**/*", "??27-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?27-*/**/*) $(locations ??27-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5354,6 +5595,7 @@ java_genrule { "?28-*/**/*", "??28-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?28-*/**/*) $(locations ??28-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5373,6 +5615,7 @@ java_genrule { "?29-*/**/*", "??29-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?29-*/**/*) $(locations ??29-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5392,6 +5635,7 @@ java_genrule { "?30-*/**/*", "??30-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?30-*/**/*) $(locations ??30-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5411,6 +5655,7 @@ java_genrule { "?31-*/**/*", "??31-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?31-*/**/*) $(locations ??31-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5430,6 +5675,7 @@ java_genrule { "?32-*/**/*", "??32-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?32-*/**/*) $(locations ??32-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5449,6 +5695,7 @@ java_genrule { "?33-*/**/*", "??33-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?33-*/**/*) $(locations ??33-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5468,6 +5715,7 @@ java_genrule { "?34-*/**/*", "??34-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?34-*/**/*) $(locations ??34-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5487,6 +5735,7 @@ java_genrule { "?35-*/**/*", "??35-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?35-*/**/*) $(locations ??35-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5506,6 +5755,7 @@ java_genrule { "?36-*/**/*", "??36-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?36-*/**/*) $(locations ??36-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5525,6 +5775,7 @@ java_genrule { "?37-*/**/*", "??37-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?37-*/**/*) $(locations ??37-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5544,6 +5795,7 @@ java_genrule { "?38-*/**/*", "??38-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?38-*/**/*) $(locations ??38-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5563,6 +5815,7 @@ java_genrule { "?39-*/**/*", "??39-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?39-*/**/*) $(locations ??39-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5582,6 +5835,7 @@ java_genrule { "?40-*/**/*", "??40-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?40-*/**/*) $(locations ??40-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5601,6 +5855,7 @@ java_genrule { "?41-*/**/*", "??41-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?41-*/**/*) $(locations ??41-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5620,6 +5875,7 @@ java_genrule { "?42-*/**/*", "??42-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?42-*/**/*) $(locations ??42-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5639,6 +5895,7 @@ java_genrule { "?43-*/**/*", "??43-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?43-*/**/*) $(locations ??43-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5658,6 +5915,7 @@ java_genrule { "?44-*/**/*", "??44-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?44-*/**/*) $(locations ??44-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5677,6 +5935,7 @@ java_genrule { "?45-*/**/*", "??45-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?45-*/**/*) $(locations ??45-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5696,6 +5955,7 @@ java_genrule { "?46-*/**/*", "??46-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?46-*/**/*) $(locations ??46-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5715,6 +5975,7 @@ java_genrule { "?47-*/**/*", "??47-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?47-*/**/*) $(locations ??47-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5734,6 +5995,7 @@ java_genrule { "?48-*/**/*", "??48-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?48-*/**/*) $(locations ??48-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5753,6 +6015,7 @@ java_genrule { "?49-*/**/*", "??49-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?49-*/**/*) $(locations ??49-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5772,6 +6035,7 @@ java_genrule { "?50-*/**/*", "??50-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?50-*/**/*) $(locations ??50-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5791,6 +6055,7 @@ java_genrule { "?51-*/**/*", "??51-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?51-*/**/*) $(locations ??51-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5810,6 +6075,7 @@ java_genrule { "?52-*/**/*", "??52-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?52-*/**/*) $(locations ??52-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5829,6 +6095,7 @@ java_genrule { "?53-*/**/*", "??53-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?53-*/**/*) $(locations ??53-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5848,6 +6115,7 @@ java_genrule { "?54-*/**/*", "??54-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?54-*/**/*) $(locations ??54-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5867,6 +6135,7 @@ java_genrule { "?55-*/**/*", "??55-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?55-*/**/*) $(locations ??55-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5886,6 +6155,7 @@ java_genrule { "?56-*/**/*", "??56-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?56-*/**/*) $(locations ??56-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5905,6 +6175,7 @@ java_genrule { "?57-*/**/*", "??57-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?57-*/**/*) $(locations ??57-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5924,6 +6195,7 @@ java_genrule { "?58-*/**/*", "??58-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?58-*/**/*) $(locations ??58-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5943,6 +6215,7 @@ java_genrule { "?59-*/**/*", "??59-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?59-*/**/*) $(locations ??59-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5962,6 +6235,7 @@ java_genrule { "?60-*/**/*", "??60-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?60-*/**/*) $(locations ??60-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -5981,6 +6255,7 @@ java_genrule { "?61-*/**/*", "??61-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?61-*/**/*) $(locations ??61-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6000,6 +6275,7 @@ java_genrule { "?62-*/**/*", "??62-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?62-*/**/*) $(locations ??62-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6019,6 +6295,7 @@ java_genrule { "?63-*/**/*", "??63-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?63-*/**/*) $(locations ??63-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6038,6 +6315,7 @@ java_genrule { "?64-*/**/*", "??64-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?64-*/**/*) $(locations ??64-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6057,6 +6335,7 @@ java_genrule { "?65-*/**/*", "??65-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?65-*/**/*) $(locations ??65-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6076,6 +6355,7 @@ java_genrule { "?66-*/**/*", "??66-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?66-*/**/*) $(locations ??66-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6095,6 +6375,7 @@ java_genrule { "?67-*/**/*", "??67-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?67-*/**/*) $(locations ??67-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6114,6 +6395,7 @@ java_genrule { "?68-*/**/*", "??68-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?68-*/**/*) $(locations ??68-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6133,6 +6415,7 @@ java_genrule { "?69-*/**/*", "??69-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?69-*/**/*) $(locations ??69-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6152,6 +6435,7 @@ java_genrule { "?70-*/**/*", "??70-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?70-*/**/*) $(locations ??70-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6171,6 +6455,7 @@ java_genrule { "?71-*/**/*", "??71-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?71-*/**/*) $(locations ??71-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6190,6 +6475,7 @@ java_genrule { "?72-*/**/*", "??72-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?72-*/**/*) $(locations ??72-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6209,6 +6495,7 @@ java_genrule { "?73-*/**/*", "??73-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?73-*/**/*) $(locations ??73-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6228,6 +6515,7 @@ java_genrule { "?74-*/**/*", "??74-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?74-*/**/*) $(locations ??74-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6247,6 +6535,7 @@ java_genrule { "?75-*/**/*", "??75-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?75-*/**/*) $(locations ??75-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6266,6 +6555,7 @@ java_genrule { "?76-*/**/*", "??76-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?76-*/**/*) $(locations ??76-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6285,6 +6575,7 @@ java_genrule { "?77-*/**/*", "??77-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?77-*/**/*) $(locations ??77-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6304,6 +6595,7 @@ java_genrule { "?78-*/**/*", "??78-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?78-*/**/*) $(locations ??78-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6323,6 +6615,7 @@ java_genrule { "?79-*/**/*", "??79-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?79-*/**/*) $(locations ??79-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6342,6 +6635,7 @@ java_genrule { "?80-*/**/*", "??80-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?80-*/**/*) $(locations ??80-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6361,6 +6655,7 @@ java_genrule { "?81-*/**/*", "??81-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?81-*/**/*) $(locations ??81-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6380,6 +6675,7 @@ java_genrule { "?82-*/**/*", "??82-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?82-*/**/*) $(locations ??82-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6399,6 +6695,7 @@ java_genrule { "?83-*/**/*", "??83-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?83-*/**/*) $(locations ??83-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6418,6 +6715,7 @@ java_genrule { "?84-*/**/*", "??84-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?84-*/**/*) $(locations ??84-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6437,6 +6735,7 @@ java_genrule { "?85-*/**/*", "??85-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?85-*/**/*) $(locations ??85-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6456,6 +6755,7 @@ java_genrule { "?86-*/**/*", "??86-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?86-*/**/*) $(locations ??86-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6475,6 +6775,7 @@ java_genrule { "?87-*/**/*", "??87-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?87-*/**/*) $(locations ??87-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6494,6 +6795,7 @@ java_genrule { "?88-*/**/*", "??88-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?88-*/**/*) $(locations ??88-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6513,6 +6815,7 @@ java_genrule { "?89-*/**/*", "??89-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?89-*/**/*) $(locations ??89-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6532,6 +6835,7 @@ java_genrule { "?90-*/**/*", "??90-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?90-*/**/*) $(locations ??90-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6551,6 +6855,7 @@ java_genrule { "?91-*/**/*", "??91-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?91-*/**/*) $(locations ??91-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6570,6 +6875,7 @@ java_genrule { "?92-*/**/*", "??92-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?92-*/**/*) $(locations ??92-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6589,6 +6895,7 @@ java_genrule { "?93-*/**/*", "??93-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?93-*/**/*) $(locations ??93-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6608,6 +6915,7 @@ java_genrule { "?94-*/**/*", "??94-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?94-*/**/*) $(locations ??94-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6627,6 +6935,7 @@ java_genrule { "?95-*/**/*", "??95-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?95-*/**/*) $(locations ??95-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6646,6 +6955,7 @@ java_genrule { "?96-*/**/*", "??96-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?96-*/**/*) $(locations ??96-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6665,6 +6975,7 @@ java_genrule { "?97-*/**/*", "??97-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?97-*/**/*) $(locations ??97-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6684,6 +6995,7 @@ java_genrule { "?98-*/**/*", "??98-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?98-*/**/*) $(locations ??98-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6703,6 +7015,7 @@ java_genrule { "?99-*/**/*", "??99-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode jvm $(locations ?99-*/**/*) $(locations ??99-*/**/*)", defaults: ["art-run-test-jvm-data-defaults"], } @@ -6724,15 +7037,7 @@ java_genrule { ], defaults: ["art-run-test-jvm-data-defaults"], tools: ["hiddenapi"], - cmd: "$(location run_test_build.py) --out $(out) --mode jvm " + - "--bootclasspath $(location :art-run-test-bootclasspath) " + - "--d8 $(location d8) " + - "--hiddenapi $(location hiddenapi) " + - "--jasmin $(location jasmin) " + - "--smali $(location android-smali) " + - "--soong_zip $(location soong_zip) " + - "--zipalign $(location zipalign) " + - "$(in)", + cmd: TEST_BUILD_COMMON_ARGS + "--hiddenapi $(location hiddenapi) --mode jvm $(locations ???-*hiddenapi*/**/*) $(locations ????-*hiddenapi*/**/*)", } // Install in the output directory to make it accessible for tests. @@ -6755,21 +7060,31 @@ genrule_defaults { "run_test_build.py", ":art-run-test-bootclasspath", ], + srcs: [ + // Since genrules are sandboxed, all the sources they use must be listed in + // the Android.bp file. Some tests have symlinks to files from other tests, and + // those must also be listed to avoid a dangling symlink in the sandbox. + "jvmti-common/*.java", + "utils/python/**/*.py", + ":development_docs", + ":asm-9.2-filegroup", + ":ojluni-AbstractCollection", + "988-method-trace/expected-stdout.txt", + "988-method-trace/expected-stderr.txt", + "988-method-trace/src/art/Test988Intrinsics.java", + "988-method-trace/src/art/Test988.java", + "988-method-trace/trace_fib.cc", + "1953-pop-frame/src/art/Test1953.java", + "1953-pop-frame/src/art/SuspendEvents.java", + ], tools: [ + "android-smali", "d8", "jasmin", - "android-smali", + "rewrapper", "soong_zip", "zipalign", ], - cmd: "$(location run_test_build.py) --out $(out) --mode jvm " + - "--bootclasspath $(location :art-run-test-bootclasspath) " + - "--d8 $(location d8) " + - "--jasmin $(location jasmin) " + - "--smali $(location android-smali) " + - "--soong_zip $(location soong_zip) " + - "--zipalign $(location zipalign) " + - "$(in)", } java_genrule { diff --git a/test/Android.run-test.bp.py b/test/Android.run-test.bp.py index 0282d405e4..be14a2d3b1 100755 --- a/test/Android.run-test.bp.py +++ b/test/Android.run-test.bp.py @@ -16,24 +16,37 @@ """ This script generates the Android.run-test.bp build file""" -import os, textwrap +import glob +import json +import os +import textwrap +import sys def main(): - test_dir = os.path.dirname(__file__) - with open(os.path.join(test_dir, "Android.run-test.bp"), mode="wt") as f: - f.write(textwrap.dedent(""" - // This file was generated by {} + os.chdir(os.path.dirname(__file__)) + with open("Android.run-test.bp", mode="wt") as f: + f.write(textwrap.dedent(f""" + // This file was generated by {os.path.basename(__file__)} // It is not necessary to regenerate it when tests are added/removed/modified. - """.format(os.path.basename(__file__))).lstrip()) + + TEST_BUILD_COMMON_ARGS = "$(location run_test_build.py) --out $(out) " + + "--bootclasspath $(location :art-run-test-bootclasspath) " + + "--d8 $(location d8) " + + "--jasmin $(location jasmin) " + + "--rewrapper $(location rewrapper) " + + "--smali $(location android-smali) " + + "--soong_zip $(location soong_zip) " + + "--zipalign $(location zipalign) " + """).lstrip()) for mode in ["host", "target", "jvm"]: names = [] # Group the tests into shards based on the last two digits of the test number. # This keeps the number of generated genrules low so we don't overwhelm soong, # but it still allows iterating on single test without recompiling all tests. for shard in ["{:02}".format(i) for i in range(100)]: - name = "art-run-test-{mode}-data-shard{shard}".format(mode=mode, shard=shard) + name = f"art-run-test-{mode}-data-shard{shard}" names.append(name) - f.write(textwrap.dedent(""" + f.write(textwrap.dedent(f""" java_genrule {{ name: "{name}-tmp", out: ["{name}.zip"], @@ -41,6 +54,7 @@ def main(): "?{shard}-*/**/*", "??{shard}-*/**/*", ], + cmd: TEST_BUILD_COMMON_ARGS + "--mode {mode} $(locations ?{shard}-*/**/*) $(locations ??{shard}-*/**/*)", defaults: ["art-run-test-{mode}-data-defaults"], }} @@ -52,14 +66,14 @@ def main(): sub_dir: "art", filename: "{name}.zip", }} - """.format(name=name, mode=mode, shard=shard))) + """)) # Build all hiddenapi tests in their own shard. # This removes the dependency on hiddenapi from all other shards, # which in turn removes dependency on ART C++ source code. name = "art-run-test-{mode}-data-shardHiddenApi".format(mode=mode) names.append(name) - f.write(textwrap.dedent(""" + f.write(textwrap.dedent(f""" java_genrule {{ name: "{name}-tmp", out: ["{name}.zip"], @@ -69,15 +83,7 @@ def main(): ], defaults: ["art-run-test-{mode}-data-defaults"], tools: ["hiddenapi"], - cmd: "$(location run_test_build.py) --out $(out) --mode {mode} " + - "--bootclasspath $(location :art-run-test-bootclasspath) " + - "--d8 $(location d8) " + - "--hiddenapi $(location hiddenapi) " + - "--jasmin $(location jasmin) " + - "--smali $(location android-smali) " + - "--soong_zip $(location soong_zip) " + - "--zipalign $(location zipalign) " + - "$(in)", + cmd: TEST_BUILD_COMMON_ARGS + "--hiddenapi $(location hiddenapi) --mode {mode} $(locations ???-*hiddenapi*/**/*) $(locations ????-*hiddenapi*/**/*)", }} // Install in the output directory to make it accessible for tests. @@ -88,9 +94,9 @@ def main(): sub_dir: "art", filename: "{name}.zip", }} - """.format(name=name, mode=mode))) + """)) - f.write(textwrap.dedent(""" + f.write(textwrap.dedent(f""" genrule_defaults {{ name: "art-run-test-{mode}-data-defaults", defaults: [ @@ -102,28 +108,38 @@ def main(): "run_test_build.py", ":art-run-test-bootclasspath", ], + srcs: [ + // Since genrules are sandboxed, all the sources they use must be listed in + // the Android.bp file. Some tests have symlinks to files from other tests, and + // those must also be listed to avoid a dangling symlink in the sandbox. + "jvmti-common/*.java", + "utils/python/**/*.py", + ":development_docs", + ":asm-9.2-filegroup", + ":ojluni-AbstractCollection", + "988-method-trace/expected-stdout.txt", + "988-method-trace/expected-stderr.txt", + "988-method-trace/src/art/Test988Intrinsics.java", + "988-method-trace/src/art/Test988.java", + "988-method-trace/trace_fib.cc", + "1953-pop-frame/src/art/Test1953.java", + "1953-pop-frame/src/art/SuspendEvents.java", + ], tools: [ + "android-smali", "d8", "jasmin", - "android-smali", + "rewrapper", "soong_zip", "zipalign", ], - cmd: "$(location run_test_build.py) --out $(out) --mode {mode} " + - "--bootclasspath $(location :art-run-test-bootclasspath) " + - "--d8 $(location d8) " + - "--jasmin $(location jasmin) " + - "--smali $(location android-smali) " + - "--soong_zip $(location soong_zip) " + - "--zipalign $(location zipalign) " + - "$(in)", }} - """).format(mode=mode)) + """)) name = "art-run-test-{mode}-data-merged".format(mode=mode) - srcs = ("\n"+" "*8).join('":{}-tmp",'.format(n) for n in names) - deps = ("\n"+" "*8).join('"{}",'.format(n) for n in names) - f.write(textwrap.dedent(""" + srcs = ("\n"+" "*16).join('":{}-tmp",'.format(n) for n in names) + deps = ("\n"+" "*16).join('"{}",'.format(n) for n in names) + f.write(textwrap.dedent(f""" java_genrule {{ name: "{name}-tmp", defaults: ["art_module_source_build_genrule_defaults"], @@ -146,12 +162,12 @@ def main(): sub_dir: "art", filename: "{name}.zip", }} - """).format(name=name, srcs=srcs, deps=deps)) + """)) name = "art-run-test-{mode}-data".format(mode=mode) - srcs = ("\n"+" "*8).join('":{}-tmp",'.format(n) for n in names) - deps = ("\n"+" "*8).join('"{}",'.format(n) for n in names) - f.write(textwrap.dedent(""" + srcs = ("\n"+" "*16).join('":{}-tmp",'.format(n) for n in names) + deps = ("\n"+" "*16).join('"{}",'.format(n) for n in names) + f.write(textwrap.dedent(f""" // Phony target used to build all shards java_genrule {{ name: "{name}-tmp", @@ -178,7 +194,7 @@ def main(): sub_dir: "art", filename: "{name}.txt", }} - """).format(name=name, srcs=srcs, deps=deps)) + """)) if __name__ == "__main__": main() diff --git a/test/run_test_build.py b/test/run_test_build.py index 19f2993c78..b42b82a8e5 100755 --- a/test/run_test_build.py +++ b/test/run_test_build.py @@ -82,6 +82,7 @@ class BuildTestContext: self.jasmin = functools.partial(self.run, args.jasmin.absolute()) self.javac = functools.partial(self.run, self.javac_path) self.smali_path = args.smali.absolute() + self.rbe_rewrapper = args.rewrapper.absolute() self.smali = functools.partial(self.run, args.smali.absolute()) self.soong_zip = functools.partial(self.run, args.soong_zip.absolute()) self.zipalign = functools.partial(self.run, args.zipalign.absolute()) @@ -91,7 +92,6 @@ class BuildTestContext: # RBE wrapper for some of the tools. if "RBE_server_address" in os.environ and USE_RBE > (hash(self.test_name) % 100): self.rbe_exec_root = os.environ.get("RBE_exec_root") - self.rbe_rewrapper = self.android_build_top / "prebuilts/remoteexecution-client/live/rewrapper" # TODO(b/307932183) Regression: RBE produces wrong output for D8 in ART disable_d8 = any((self.test_dir / n).exists() for n in ["classes", "src2", "src-art"]) @@ -539,6 +539,7 @@ def main() -> None: parser.add_argument("--d8", type=Path) parser.add_argument("--hiddenapi", type=Path) parser.add_argument("--jasmin", type=Path) + parser.add_argument("--rewrapper", type=Path) parser.add_argument("--smali", type=Path) parser.add_argument("--soong_zip", type=Path) parser.add_argument("--zipalign", type=Path) |