Don't run art tests when executing desugared library tests
Since they don't require library desugaring, they don't provide
much value
Bug: b/234403764
Change-Id: Id17d7cb7075d73fcf18f1e733d73f30a3ddaf18c
diff --git a/build.gradle b/build.gradle
index 21a20be..71a73a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2274,6 +2274,9 @@
if (!project.hasProperty('all_tests')) {
exclude "com/android/tools/r8/art/dx/**"
}
+ if (project.hasProperty('no_arttests')) {
+ exclude "com/android/tools/r8/art/**"
+ }
if (project.hasProperty('shard_count') ) {
assert project.hasProperty('shard_number')
int shard_count = project.getProperty('shard_count') as Integer
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 0323612..ca4bc25 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -97,6 +97,7 @@
' "--one_line_per_test",'
' "--archive_failures",'
' "--no_internal",'
+ ' "--no_arttests",'
' "--desugared-library",'
' "HEAD"'
' ]'
@@ -132,6 +133,7 @@
' "--one_line_per_test",'
' "--archive_failures",'
' "--no_internal",'
+ ' "--no_arttests",'
' "--desugared-library",'
' "HEAD",'
' "--desugared-library-configuration",'
diff --git a/infra/config/global/generated/project.cfg b/infra/config/global/generated/project.cfg
index 6153ae8..53f90a7 100644
--- a/infra/config/global/generated/project.cfg
+++ b/infra/config/global/generated/project.cfg
@@ -7,7 +7,7 @@
name: "r8"
access: "group:all"
lucicfg {
- version: "1.30.10"
+ version: "1.30.11"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 4949fc2..d1529cf 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -342,6 +342,7 @@
"--one_line_per_test",
"--archive_failures",
"--no_internal",
+ "--no_arttests",
"--desugared-library",
"HEAD"
]
diff --git a/tools/test.py b/tools/test.py
index 27c07de..570da44 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -134,6 +134,9 @@
result.add_option('--no-r8lib', '--no_r8lib',
default=False, action='store_true',
help='Run the tests on R8 full with relocated dependencies.')
+ result.add_option('--no-arttests', '--no_arttests',
+ default=False, action='store_true',
+ help='Do not run the art tests.')
result.add_option('--r8lib-no-deps', '--r8lib_no_deps',
default=False, action='store_true',
help='Run the tests on r8lib without relocated dependencies.')
@@ -345,6 +348,8 @@
gradle_args.append('-Pdesugar_jdk_json_dir=' + desugar_jdk_json_dir)
if desugar_jdk_libs:
gradle_args.append('-Pdesugar_jdk_libs=' + desugar_jdk_libs)
+ if options.no_arttests:
+ gradle_args.append('-Pno_arttests=true')
if options.reset_testing_state:
gradle_args.append('-Ptesting-state')
gradle_args.append('-Preset-testing-state')
