Skip to content

Commit 841d765

Browse files
bcorsoDagger Team
authored andcommitted
Internal changes
RELNOTES=N/A PiperOrigin-RevId: 700463572
1 parent 2d75be9 commit 841d765

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

test_defs.bzl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,9 @@ def _GenTestsWithVariants(
207207

208208
build_variants = _FUNCTIONAL_BUILD_VARIANTS if functional else _NON_FUNCTIONAL_BUILD_VARIANTS
209209
for (variant_name, variant_javacopts) in build_variants.items():
210+
merged_javacopts = javacopts + variant_javacopts
210211
for is_ksp in (True, False):
212+
merged_plugins = plugins
211213
if variant_name:
212214
suffix = "_" + variant_name
213215
tags = [variant_name]
@@ -232,8 +234,8 @@ def _GenTestsWithVariants(
232234
srcs = supporting_files,
233235
tags = tags,
234236
deps = deps + variant_deps,
235-
plugins = plugins,
236-
javacopts = javacopts + variant_javacopts,
237+
plugins = merged_plugins,
238+
javacopts = merged_javacopts,
237239
functional = functional,
238240
require_jdk7_syntax = require_jdk7_syntax,
239241
)
@@ -249,8 +251,8 @@ def _GenTestsWithVariants(
249251
srcs = [test_file],
250252
tags = tags,
251253
deps = test_deps + variant_deps,
252-
plugins = plugins,
253-
javacopts = javacopts + variant_javacopts,
254+
plugins = merged_plugins,
255+
javacopts = merged_javacopts,
254256
shard_count = shard_count,
255257
jvm_flags = jvm_flags,
256258
functional = functional,

0 commit comments

Comments
 (0)