diff options
| author | 2025-01-06 18:24:23 -0800 | |
|---|---|---|
| committer | 2025-01-06 18:24:23 -0800 | |
| commit | e9600b1a66f697298b96e0206bc33d58188969a1 (patch) | |
| tree | 470cde50f5be1fe94aec5a87dadd52c75e6ddcbc /golang/golang_test.go | |
| parent | f78c8131ca5aef0ae9ee554226010e07984b1374 (diff) | |
| parent | 2e40ad9fc63204d159c6e5aeb74649e981602a0e (diff) | |
Merge changes Ib104a639,I7905581d into main
* changes:
Always use out/host for host tools
Move build_hostname.txt generation to SetupOutDir
Diffstat (limited to 'golang/golang_test.go')
| -rw-r--r-- | golang/golang_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/golang/golang_test.go b/golang/golang_test.go index 0a4baedb4..d555d144c 100644 --- a/golang/golang_test.go +++ b/golang/golang_test.go @@ -47,7 +47,7 @@ func TestGolang(t *testing.T) { bin := result.ModuleForTests("gobin", result.Config.BuildOSTarget.String()) - expected := "^out/soong/host/" + result.Config.PrebuiltOS() + "/bin/go/gobin/?[^/]*/obj/gobin$" + expected := "^out/host/" + result.Config.PrebuiltOS() + "/bin/go/gobin/?[^/]*/obj/gobin$" actual := android.PathsRelativeToTop(bin.OutputFiles(result.TestContext, t, "")) if len(actual) != 1 { t.Fatalf("Expected 1 output file, got %v", actual) |