Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Internal changes #4520

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Internal changes #4520

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions test_defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,9 @@ def _GenTestsWithVariants(

build_variants = _FUNCTIONAL_BUILD_VARIANTS if functional else _NON_FUNCTIONAL_BUILD_VARIANTS
for (variant_name, variant_javacopts) in build_variants.items():
merged_javacopts = javacopts + variant_javacopts
for is_ksp in (True, False):
merged_plugins = plugins
if variant_name:
suffix = "_" + variant_name
tags = [variant_name]
Expand All @@ -232,8 +234,8 @@ def _GenTestsWithVariants(
srcs = supporting_files,
tags = tags,
deps = deps + variant_deps,
plugins = plugins,
javacopts = javacopts + variant_javacopts,
plugins = merged_plugins,
javacopts = merged_javacopts,
functional = functional,
require_jdk7_syntax = require_jdk7_syntax,
)
Expand All @@ -249,8 +251,8 @@ def _GenTestsWithVariants(
srcs = [test_file],
tags = tags,
deps = test_deps + variant_deps,
plugins = plugins,
javacopts = javacopts + variant_javacopts,
plugins = merged_plugins,
javacopts = merged_javacopts,
shard_count = shard_count,
jvm_flags = jvm_flags,
functional = functional,
Expand Down
Loading