Skip to content

Commit

Permalink
Internal changes
Browse files Browse the repository at this point in the history
RELNOTES=N/A
PiperOrigin-RevId: 700463572
  • Loading branch information
bcorso authored and Dagger Team committed Nov 26, 2024
1 parent 2d75be9 commit 841d765
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions test_defs.bzl
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

0 comments on commit 841d765

Please sign in to comment.