aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiz Kammer <eakammer@google.com>2023-08-08 10:04:53 -0400
committerLiz Kammer <eakammer@google.com>2023-08-08 10:04:53 -0400
commit1d100f64eb711fc9093c92703b3fffc4700cd185 (patch)
treec055a745dfcc4ad0a48ffbcf848ffeea2c5bc282
parentd07075e1e0d36b0ca1fd78683ca0f898edab51d4 (diff)
downloadxsdc-1d100f64eb711fc9093c92703b3fffc4700cd185.tar.gz
Set sdk_version in tests
Java bp2build is preventing migration of sdk_version unset until Bazel supports sdk_version not being set. Test: m nothing Change-Id: I7dcc7c34e2e1d109dab1a16af00470a144f08403
-rw-r--r--build/xsdc_bp2build_conversion_test.go12
1 files changed, 8 insertions, 4 deletions
diff --git a/build/xsdc_bp2build_conversion_test.go b/build/xsdc_bp2build_conversion_test.go
index 1d2be58..977f4be 100644
--- a/build/xsdc_bp2build_conversion_test.go
+++ b/build/xsdc_bp2build_conversion_test.go
@@ -41,10 +41,12 @@ const (
java_preamble = `
java_library {
name: "stub-annotations",
+ sdk_version: "current",
bazel_module: {bp2build_available: false},
}
java_library {
name: "kxml2-2.3.0",
+ sdk_version: "current",
host_supported: true,
bazel_module: {bp2build_available: false},
}
@@ -167,6 +169,7 @@ java_library {
"A.java",
":foo"
],
+ sdk_version: "current",
}`,
ExpectedBazelTargets: []string{
bp2build.MakeBazelTarget("cc_library_static", "cclib_bp2build_cc_library_static", bp2build.AttrNameToString{
@@ -178,11 +181,12 @@ java_library {
"implementation_whole_archive_deps": `[":foo-cpp"]`,
}),
bp2build.MakeBazelTarget("java_library", "javalib", bp2build.AttrNameToString{
- "srcs": `["A.java"]`,
- "deps": `[":foo-java"]`,
- "exports": `[":foo-java"]`,
+ "srcs": `["A.java"]`,
+ "deps": `[":foo-java"]`,
+ "exports": `[":foo-java"]`,
+ "sdk_version": `"current"`,
}),
- bp2build.MakeNeverlinkDuplicateTargetWithAttrs("java_library", "javalib", bp2build.AttrNameToString{}),
+ bp2build.MakeNeverlinkDuplicateTarget("java_library", "javalib"),
},
})
}