From: changwang ma <machangwang.cn@gmail.com>
Date: Thu, 24 Oct 2024 15:02:46 +0000 (+0800)
Subject: cmd/link, go/internal/gccgoimporter: get ar from env by default in tests
X-Git-Tag: go1.24rc1~583
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c77ca70f44b2efd71c13e0322b70a977408c2750;p=gostls13.git

cmd/link, go/internal/gccgoimporter: get ar from env by default in tests

Change-Id: Ib64b1f641fcf795a51aaf31639d37927dab519e5
Reviewed-on: https://go-review.googlesource.com/c/go/+/622237
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
---

diff --git a/src/cmd/link/dwarf_test.go b/src/cmd/link/dwarf_test.go
index 25d906bc82..68849d7db9 100644
--- a/src/cmd/link/dwarf_test.go
+++ b/src/cmd/link/dwarf_test.go
@@ -121,10 +121,14 @@ func testDWARF(t *testing.T, buildmode string, expectDWARF bool, env ...string)
 
 			if buildmode == "c-archive" {
 				// Extract the archive and use the go.o object within.
-				cmd := testenv.Command(t, "ar", "-x", exe)
+				ar := os.Getenv("AR")
+				if ar == "" {
+					ar = "ar"
+				}
+				cmd := testenv.Command(t, ar, "-x", exe)
 				cmd.Dir = tmpDir
 				if out, err := cmd.CombinedOutput(); err != nil {
-					t.Fatalf("ar -x %s: %v\n%s", exe, err, out)
+					t.Fatalf("%s -x %s: %v\n%s", ar, exe, err, out)
 				}
 				exe = filepath.Join(tmpDir, "go.o")
 			}
diff --git a/src/go/internal/gccgoimporter/importer_test.go b/src/go/internal/gccgoimporter/importer_test.go
index 76b4500f3b..a965a55409 100644
--- a/src/go/internal/gccgoimporter/importer_test.go
+++ b/src/go/internal/gccgoimporter/importer_test.go
@@ -180,11 +180,15 @@ func TestObjImporter(t *testing.T) {
 
 		runImporterTest(t, imp, initmap, &test)
 
-		cmd = testenv.Command(t, "ar", "cr", afile, ofile)
+		ar := os.Getenv("AR")
+		if ar == "" {
+			ar = "ar"
+		}
+		cmd = testenv.Command(t, ar, "cr", afile, ofile)
 		out, err = cmd.CombinedOutput()
 		if err != nil {
 			t.Logf("%s", out)
-			t.Fatalf("ar cr %s %s failed: %s", afile, ofile, err)
+			t.Fatalf("%s cr %s %s failed: %s", ar, afile, ofile, err)
 		}
 
 		runImporterTest(t, arimp, arinitmap, &test)