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

Commit f98384ad authored by Jingwen Chen's avatar Jingwen Chen Committed by Gerrit Code Review
Browse files

Merge "bp2build: rename variables for readability."

parents f17b07fc 4e4756d7

bp2build/build_conversion_test.go

+6 −6
Original line number Diff line number Diff line
@@ -201,8 +201,8 @@ func TestGenerateSoongModuleTargets(t *testing.T) { 
		android.FailIfErrored(t, errs)



		bazelTargets := GenerateSoongModuleTargets(ctx.Context.Context, false)[dir]

		if g, w := len(bazelTargets), 1; g != w {

			t.Fatalf("Expected %d bazel target, got %d", w, g)

		if actualCount, expectedCount := len(bazelTargets), 1; actualCount != expectedCount {

			t.Fatalf("Expected %d bazel target, got %d", expectedCount, actualCount)

		}



		actualBazelTarget := bazelTargets[0]
@@ -252,8 +252,8 @@ func TestGenerateBazelTargetModules(t *testing.T) { 
		android.FailIfErrored(t, errs)



		bazelTargets := GenerateSoongModuleTargets(ctx.Context.Context, true)[dir]

		if g, w := len(bazelTargets), 1; g != w {

			t.Fatalf("Expected %d bazel target, got %d", w, g)

		if actualCount, expectedCount := len(bazelTargets), 1; actualCount != expectedCount {

			t.Fatalf("Expected %d bazel target, got %d", expectedCount, actualCount)

		}



		actualBazelTarget := bazelTargets[0]
@@ -317,8 +317,8 @@ func TestModuleTypeBp2Build(t *testing.T) { 
		android.FailIfErrored(t, errs)



		bazelTargets := GenerateSoongModuleTargets(ctx.Context.Context, true)[dir]

		if g, w := len(bazelTargets), 1; g != w {

			t.Fatalf("Expected %d bazel target, got %d", w, g)

		if actualCount, expectedCount := len(bazelTargets), 1; actualCount != expectedCount {

			t.Fatalf("Expected %d bazel target, got %d", expectedCount, actualCount)

		}



		actualBazelTarget := bazelTargets[0]