Merge "Revert "Do not convert non-unit tests."" into main (6525ee82) · Commits · e / os / android_build_soong

bp2build/cc_test_conversion_test.go

+0 −20

Original line number	Diff line number	Diff line
		@@ -631,23 +631,3 @@ cc_test {
		},
		})
		}

		func TestCcTest_UnitTestFalse(t *testing.T) {
		runCcTestTestCase(t, ccTestBp2buildTestCase{
		description: "cc test with test_options.tags converted to tags",
		blueprint: `
		cc_test {
		name: "mytest",
		host_supported: true,
		srcs: ["test.cpp"],
		test_options: { unit_test: false },
		}
		` + simpleModule("cc_library_static", "libgtest_main") +
		simpleModule("cc_library_static", "libgtest"),
		stubbedBuildDefinitions: []string{
		"libgtest_main",
		"libgtest",
		},
		targets: []testBazelTarget{},
		})
		}

+0 −8

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import (
		"android/soong/bazel"
		"android/soong/bazel/cquery"
		"android/soong/tradefed"
		"android/soong/ui/metrics/bp2build_metrics_proto"
		)

		// TestLinkerProperties properties to be registered via the linker
		@@ -719,13 +718,6 @@ func testBinaryBp2build(ctx android.Bp2buildMutatorContext, m *Module) {
		combinedData.Append(android.BazelLabelForModuleDeps(ctx, p.Data_libs))
		data.SetSelectValue(axis, config, combinedData)
		tags.SetSelectValue(axis, config, p.Test_options.Tags)

		// TODO: b/300117121 - handle bp2build conversion of non-unit tests
		// default to true to only handle non-nil falses
		if !BoolDefault(p.Test_options.Unit_test, true) {
		ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_PROPERTY_UNSUPPORTED, "Host unit_test = false")
		return
		}
		}
		}
		}