From 7e2e79433367ccdce8d7b14e44f55b3e13fdff9e Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 16 Nov 2023 12:56:02 -0800 Subject: [PATCH] Fix soong for go test ./... Fix various issues that prevent building or running tests with the Go tools: Remove testing/test_spec_proto/go.mod. There's already a go.mod at the top level, and adding testing/test_spec_proto/go.mod breaks compiling with the Go tools in IntelliJ or from the command line. Fix go vet issues when trying to print []DataPath. Fix aconfig_conversion_test.go and add it to Android.bp so it runs in presubmit. Test: go test ./... Change-Id: I18af2f05631446fe507744a2951e4b02c7ab59be --- bp2build/Android.bp | 2 ++ bp2build/aconfig_conversion_test.go | 6 ++---- cc/cc_test.go | 6 +++--- rust/test_test.go | 6 +++--- testing/test_spec_proto/go.mod | 2 -- 5 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 testing/test_spec_proto/go.mod diff --git a/bp2build/Android.bp b/bp2build/Android.bp index 14e32edd9..64ee01f88 100644 --- a/bp2build/Android.bp +++ b/bp2build/Android.bp @@ -6,6 +6,7 @@ bootstrap_go_package { name: "soong-bp2build", pkgPath: "android/soong/bp2build", srcs: [ + "aconfig_conversion_test.go", "androidbp_to_build_templates.go", "bp2build.go", "bp2build_product_config.go", @@ -21,6 +22,7 @@ bootstrap_go_package { deps: [ "blueprint-bootstrap", "soong-aidl-library", + "soong-aconfig", "soong-android", "soong-android-allowlists", "soong-android-soongconfig", diff --git a/bp2build/aconfig_conversion_test.go b/bp2build/aconfig_conversion_test.go index ca41680a6..d6e20df12 100644 --- a/bp2build/aconfig_conversion_test.go +++ b/bp2build/aconfig_conversion_test.go @@ -156,7 +156,7 @@ func TestJavaAconfigLibrary(t *testing.T) { name: "foo", aconfig_declarations: "foo_aconfig_declarations", libs: ["foo_java_library"], - test: true, + mode: "test", } ` expectedBazelTargets := []string{ @@ -184,7 +184,6 @@ func TestJavaAconfigLibrary(t *testing.T) { AttrNameToString{ "aconfig_declarations": `":foo_aconfig_declarations"`, "libs": `[":foo_java_library-neverlink"]`, - "test": `True`, "sdk_version": `"system_current"`, "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, }, @@ -213,7 +212,7 @@ func TestJavaAconfigLibraryAsTaggedOutput(t *testing.T) { java_aconfig_library { name: "foo_aconfig_library", aconfig_declarations: "foo_aconfig_declarations", - test: true, + mode: "test", } ` expectedBazelTargets := []string{ @@ -230,7 +229,6 @@ func TestJavaAconfigLibraryAsTaggedOutput(t *testing.T) { "foo_aconfig_library", AttrNameToString{ "aconfig_declarations": `":foo_aconfig_declarations"`, - "test": `True`, "sdk_version": `"system_current"`, "target_compatible_with": `["//build/bazel_common_rules/platforms/os:android"]`, }, diff --git a/cc/cc_test.go b/cc/cc_test.go index 794c5ee51..e2dba9043 100644 --- a/cc/cc_test.go +++ b/cc/cc_test.go @@ -720,7 +720,7 @@ func TestDataLibs(t *testing.T) { return } if len(testBinary.dataPaths()) != 1 { - t.Errorf("expected exactly one test data file. test data files: [%s]", testBinary.dataPaths()) + t.Errorf("expected exactly one test data file. test data files: [%v]", testBinary.dataPaths()) return } @@ -777,7 +777,7 @@ func TestDataLibsRelativeInstallPath(t *testing.T) { t.Fatalf("expected exactly one output file. output files: [%s]", outputFiles) } if len(testBinary.dataPaths()) != 2 { - t.Fatalf("expected exactly one test data file. test data files: [%s]", testBinary.dataPaths()) + t.Fatalf("expected exactly one test data file. test data files: [%v]", testBinary.dataPaths()) } outputPath := outputFiles[0].String() @@ -3332,7 +3332,7 @@ func TestDataLibsPrebuiltSharedTestLibrary(t *testing.T) { t.Errorf("expected exactly one output file. output files: [%s]", outputFiles) } if len(testBinary.dataPaths()) != 1 { - t.Errorf("expected exactly one test data file. test data files: [%s]", testBinary.dataPaths()) + t.Errorf("expected exactly one test data file. test data files: [%v]", testBinary.dataPaths()) } outputPath := outputFiles[0].String() diff --git a/rust/test_test.go b/rust/test_test.go index 8906f1cb0..6d0ebcf28 100644 --- a/rust/test_test.go +++ b/rust/test_test.go @@ -38,7 +38,7 @@ func TestRustTest(t *testing.T) { dataPaths := testingModule.Module().(*Module).compiler.(*testDecorator).dataPaths() if len(dataPaths) != 1 { - t.Errorf("expected exactly one test data file. test data files: [%s]", dataPaths) + t.Errorf("expected exactly one test data file. test data files: [%v]", dataPaths) return } } @@ -116,7 +116,7 @@ func TestDataLibs(t *testing.T) { t.Fatalf("expected exactly one output file. output files: [%s]", outputFiles) } if len(testBinary.dataPaths()) != 2 { - t.Fatalf("expected exactly two test data files. test data files: [%s]", testBinary.dataPaths()) + t.Fatalf("expected exactly two test data files. test data files: [%v]", testBinary.dataPaths()) } outputPath := outputFiles[0].String() @@ -178,7 +178,7 @@ func TestDataLibsRelativeInstallPath(t *testing.T) { t.Fatalf("expected exactly one output file. output files: [%s]", outputFiles) } if len(testBinary.dataPaths()) != 3 { - t.Fatalf("expected exactly two test data files. test data files: [%s]", testBinary.dataPaths()) + t.Fatalf("expected exactly two test data files. test data files: [%v]", testBinary.dataPaths()) } outputPath := outputFiles[0].String() diff --git a/testing/test_spec_proto/go.mod b/testing/test_spec_proto/go.mod deleted file mode 100644 index 482cdbbd1..000000000 --- a/testing/test_spec_proto/go.mod +++ /dev/null @@ -1,2 +0,0 @@ -module test_spec_proto -go 1.18 \ No newline at end of file