StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update bp2build tests to use stubbed defs" into main

Browse Source
This commit is contained in:
Christopher Parsons
2023-09-28 17:23:50 +00:00
committed by Gerrit Code Review
parent 0843b79d8c 8a532b78e5
commit e3f7a0d4d6
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bp2build/aconfig_conversion_test.go
View File

@@ -105,7 +105,6 @@ func TestCcAconfigLibrary(t *testing.T) {
cc_library { cc_library {
name: "server_configurable_flags", name: "server_configurable_flags",
srcs: ["bar.cc"], srcs: ["bar.cc"],
bazel_module: { bp2build_available: false },
} }
cc_aconfig_library { cc_aconfig_library {
name: "foo", name: "foo",
@@ -133,5 +132,6 @@ func TestCcAconfigLibrary(t *testing.T) {
RunBp2BuildTestCase(t, registerAconfigModuleTypes, Bp2buildTestCase{ RunBp2BuildTestCase(t, registerAconfigModuleTypes, Bp2buildTestCase{
Blueprint: bp, Blueprint: bp,
ExpectedBazelTargets: expectedBazelTargets, ExpectedBazelTargets: expectedBazelTargets,
StubbedBuildDefinitions: []string{"server_configurable_flags"},
}) })
} }

2
bp2build/cc_library_conversion_test.go
View File

@@ -5161,7 +5161,6 @@ func TestNdkLibraryConversion(t *testing.T) {
Blueprint: ` Blueprint: `
cc_library { cc_library {
name: "libfoo", name: "libfoo",
bazel_module: { bp2build_available: false },
} }
ndk_library { ndk_library {
name: "libfoo", name: "libfoo",
@@ -5169,6 +5168,7 @@ ndk_library {
symbol_file: "libfoo.map.txt", symbol_file: "libfoo.map.txt",
} }
`, `,
StubbedBuildDefinitions: []string{"libfoo"},
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("cc_stub_suite", "libfoo.ndk_stub_libs", AttrNameToString{ MakeBazelTarget("cc_stub_suite", "libfoo.ndk_stub_libs", AttrNameToString{
"api_surface": `"publicapi"`, "api_surface": `"publicapi"`,

3
bp2build/java_test_host_conversion_test.go
View File

@@ -97,14 +97,13 @@ java_test_host {
java_library { java_library {
name: "lib_a", name: "lib_a",
bazel_module: { bp2build_available: false },
} }
java_library { java_library {
name: "static_libs_a", name: "static_libs_a",
bazel_module: { bp2build_available: false },
} }
`, `,
StubbedBuildDefinitions: []string{"lib_a", "static_libs_a"},
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("java_test", "java_test_host-1", AttrNameToString{ MakeBazelTarget("java_test", "java_test_host-1", AttrNameToString{
"runtime_deps": `[ "runtime_deps": `[