Change jctf to explicitly set test options
Bug: 201375599
Change-Id: I8cb1a68bc9fa871cb2c70f70b538eb899df498b1
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 8d83b0c..4f7bf93 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -628,9 +628,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: "dex_vm:\"all\""
- properties_j: "only_jctf:\"true\""
- properties_j: "tool:\"d8\""
+ properties_j: "test_options:[\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\",\"--dex_vm=all\",\"--tool=d8\",\"--only_jctf\"]"
}
priority: 26
execution_timeout_secs: 43200
@@ -656,9 +654,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: "dex_vm:\"all\""
- properties_j: "only_jctf:\"true\""
- properties_j: "tool:\"d8\""
+ properties_j: "test_options:[\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\",\"--dex_vm=all\",\"--tool=d8\",\"--only_jctf\"]"
}
priority: 26
execution_timeout_secs: 43200
@@ -1021,9 +1017,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: "dex_vm:\"all\""
- properties_j: "only_jctf:\"true\""
- properties_j: "tool:\"r8cf\""
+ properties_j: "test_options:[\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\",\"--dex_vm=all\",\"--tool=r8cf\",\"--only_jctf\"]"
}
priority: 26
execution_timeout_secs: 43200
@@ -1049,9 +1043,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: "dex_vm:\"all\""
- properties_j: "only_jctf:\"true\""
- properties_j: "tool:\"r8cf\""
+ properties_j: "test_options:[\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\",\"--dex_vm=all\",\"--tool=r8cf\",\"--only_jctf\"]"
}
priority: 26
execution_timeout_secs: 43200
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index e3c76ba..7e93498 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -334,10 +334,14 @@
for release in ["", "_release"]:
for tool in ["d8", "r8cf"]:
properties = {
- "tool": tool,
+ "test_options" : [
+ "--no_internal",
+ "--one_line_per_test",
+ "--archive_failures",
+ "--dex_vm=all",
+ "--tool=" + tool,
+ "--only_jctf"],
"builder_group" : "internal.client.r8",
- "dex_vm" : "all",
- "only_jctf" : "true",
}
name = "linux-" + tool + "_jctf" + release
r8_builder(
