Fix running kotlin dev compiler tests on our bots
Change-Id: I5ffd16a28850e580d32c21f7650f3d1295ef5e72
diff --git a/build.gradle b/build.gradle
index de9b80f..e804c37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2201,6 +2201,13 @@
systemProperty 'test_git_HEAD_sha1', project.property('HEAD_sha1')
}
+ if (project.hasProperty('kotlin_compiler_dev')) {
+ systemProperty 'com.android.tools.r8.kotlincompilerdev', '1';
+ }
+
+ if (project.hasProperty('kotlin_compiler_old')) {
+ systemProperty 'com.android.tools.r8.kotlincompilerold', '1';
+ }
if (!useTestingState) {
testLogging.exceptionFormat = 'full'
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 4623314..31f7a57 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -1078,7 +1078,7 @@
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
properties_j: "builder_group:\"internal.client.r8\""
- properties_j: "test_options:[\"--runtimes=dex-default:jdk11\",\"--kotlin-compiler-dev\",\"--one_line_per_test\",\"--archive_failures\",\"--no-internal\",\"*kotlin*\"]"
+ properties_j: "test_options:[\"--runtimes=dex-default:jdk11\",\"--kotlin-compiler-dev\",\"--one_line_per_test\",\"--archive_failures\",\"--no-internal\",\"*kotlin*\",\"*debug*\"]"
}
priority: 26
execution_timeout_secs: 43200
@@ -1107,7 +1107,7 @@
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
properties_j: "builder_group:\"internal.client.r8\""
- properties_j: "test_options:[\"--runtimes=dex-default:jdk11\",\"--kotlin-compiler-old\",\"--one_line_per_test\",\"--archive_failures\",\"--no-internal\",\"*kotlin*\"]"
+ properties_j: "test_options:[\"--runtimes=dex-default:jdk11\",\"--kotlin-compiler-old\",\"--one_line_per_test\",\"--archive_failures\",\"--no-internal\",\"*kotlin*\",\"*debug*\"]"
}
priority: 26
execution_timeout_secs: 43200
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 3aa3fe2..6d178eb 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -332,7 +332,7 @@
expiration_timeout = time.hour * 35,
properties = {
"builder_group" : "internal.client.r8",
- "test_options" : ["--runtimes=dex-default:jdk11", "--kotlin-compiler-dev", "--one_line_per_test", "--archive_failures", "--no-internal", "*kotlin*"]
+ "test_options" : ["--runtimes=dex-default:jdk11", "--kotlin-compiler-dev", "--one_line_per_test", "--archive_failures", "--no-internal", "*kotlin*", "*debug*"]
}
)
@@ -343,7 +343,7 @@
expiration_timeout = time.hour * 35,
properties = {
"builder_group" : "internal.client.r8",
- "test_options" : ["--runtimes=dex-default:jdk11", "--kotlin-compiler-old", "--one_line_per_test", "--archive_failures", "--no-internal", "*kotlin*"]
+ "test_options" : ["--runtimes=dex-default:jdk11", "--kotlin-compiler-old", "--one_line_per_test", "--archive_failures", "--no-internal", "*kotlin*", "*debug*"]
}
)
diff --git a/tools/test.py b/tools/test.py
index f5ce159..041f17b 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -287,9 +287,9 @@
if options.print_obfuscated_stacktraces:
gradle_args.append('-Pprint_obfuscated_stacktraces')
if options.kotlin_compiler_old:
- gradle_args.append('-Dcom.android.tools.r8.kotlincompilerold=1')
+ gradle_args.append('-Pkotlin_compiler_old')
if options.kotlin_compiler_dev:
- gradle_args.append('-Dcom.android.tools.r8.kotlincompilerdev=1')
+ gradle_args.append('-Pkotlin_compiler_dev')
download_kotlin_dev.download_newest()
if os.name == 'nt':
# temporary hack
