Merging 32 commit(s) from Chromium's toolchain-utilsandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1

Merged commit digest:
  dbc8cb67 compiler_wrapper: Use ld.bfd to detect binutils path
  0274702f patch_sync: Add show subcommand
  7fd98520 patch_sync: Add patch_parsing module
  72bb9a35 patch_sync: Base code, version control managing
  457d96b5 pgo_tools: make monitor_pgo_profiles fail rather than emailing
  ed486b7b afdo_metadata: Publish the new kernel profiles
  a170d3e2 crosperf: remove dead bob DUT
  d60f468c afdo_metadata: Publish the new kernel profiles
  26b91865 llvm_tools: Update get_upstream_patch schema
  811429e3 llvm_tools: Catch dup SHAs in get_upstream_patch
  ed2aa295 compiler_wrapper: Drop "-fno-experimental-pass-manager"
  e8d03f7e rust_watch: report bugs for new minor or major versions of rustc
  443e0b36 cros_utils: Add a bug reporting module
  86fe58c1 compiler_wrapper: adds ${sysroot}/usr/lib to linker path
  d02a62da compiler_wrapper: add missing unused-but-set-var
  50d42705 afdo_metadata: Publish the new kernel profiles
  7afc3522 llvm_tools: Make skip_dependencies optional
  9de6ecbf crosperf: Increase timeout for a crosfleet call
  58a779e7 llvm_tools: adds a way to skip dependencies when pulling from Phab
  28d6cbe1 crosperf: Replace non-inclusive language
  c965dab6 afdo_metadata: Publish the new kernel profiles
  58bc0488 crosperf: Update default_remotes to new DUTs
  70c83ac3 Replace non-inclusive language
  d080198a llvm_tools: fix yapf warnings
  5200728b llvm_tools: Add lldb_server to updated_packages
  afd2d4b0 compiler_wrapper: ignore unused_but_set_variable
  217c68a1 Add crosperf_autolock.py wrapper
  dcb168bf afdo_metadata: Publish the new kernel profiles
  a7a19342 Auto-format the crosperf files
  c5e12fba Add 'no_lock' crosperf setting
  ec4d2aec afdo_metadata: Publish the new kernel profiles
  2c5d6278 compiler_wrapper: move llvmnext flag to post flags

Change-Id: Id8af179e775f6fe23c22ce05b8be9b5b02ccbaf4

1 files changed, 2 insertions, 2 deletions

diff --git a/compiler_wrapper/clang_flags_test.go b/compiler_wrapper/clang_flags_test.go
index 25c13c74..23aed7ef 100644
--- a/compiler_wrapper/clang_flags_test.go
+++ b/compiler_wrapper/clang_flags_test.go
@@ -248,7 +248,7 @@ func TestClangArchFlags(t *testing.T) {
 func TestClangLinkerPathProbesBinariesOnPath(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
 		linkerPath := filepath.Join(ctx.tempDir, "a/b/c")
-		ctx.writeFile(filepath.Join(linkerPath, "x86_64-cros-linux-gnu-ld"), "")
+		ctx.writeFile(filepath.Join(linkerPath, "x86_64-cros-linux-gnu-ld.bfd"), "")
 		ctx.env = []string{"PATH=nonExistantPath:" + linkerPath}
 		cmd := ctx.must(callCompiler(ctx, ctx.cfg,
 			ctx.newCommand("./x86_64-cros-linux-gnu-clang", mainCc)))
@@ -268,7 +268,7 @@ func TestClangLinkerPathEvaluatesSymlinksForBinariesOnPath(t *testing.T) {
 		ctx.writeFile(realLinkerPath, "")
 		firstLinkLinkerPath := filepath.Join(ctx.tempDir, "a/first/somelinker")
 		ctx.symlink(realLinkerPath, firstLinkLinkerPath)
-		secondLinkLinkerPath := filepath.Join(ctx.tempDir, "a/second/x86_64-cros-linux-gnu-ld")
+		secondLinkLinkerPath := filepath.Join(ctx.tempDir, "a/second/x86_64-cros-linux-gnu-ld.bfd")
 		ctx.symlink(firstLinkLinkerPath, secondLinkLinkerPath)
 
 		ctx.env = []string{"PATH=nonExistantPath:" + filepath.Dir(secondLinkLinkerPath)}