Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a532b78 authored Sep 27, 2023 by Chris Parsons

Update bp2build tests to use stubbed defs

bp2build tests should not use bp2build_available:false test deps,
because, with the "allowlist v2" feature, this will cause these modules
to stop being converted with bp2build. Instead, such test deps should be
"stubbed", which effectively treats them like targets in pre-existing
BUILD files on the filesystem.

Bug: 301312260
Test: m nothing
Change-Id: Ib1ce7c87cd1e98568fdaf2a52a893dafa74ab327

parent 641b62b2

bp2build/aconfig_conversion_test.go

+3 −3

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

bp2build/cc_library_conversion_test.go

+1 −1

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

bp2build/java_test_host_conversion_test.go

+1 −2

Original line number	Diff line number	Diff line
		@@ -97,14 +97,13 @@ java_test_host {

		java_library {
		name: "lib_a",
		bazel_module: { bp2build_available: false },
		}

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