From ad27d5a1be7ed71630d8cfe2ab4a9fcafc611650 Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Wed, 28 Oct 2020 16:39:05 +0000
Subject: [PATCH] Bug 1673103 - Switch SM jobs to use newer dump_syms r=calixte

Differential Revision: https://phabricator.services.mozilla.com/D94914
---
 js/src/devtools/automation/autospider.py | 8 +-------
 taskcluster/ci/spidermonkey/kind.yml     | 1 +
 taskcluster/ci/spidermonkey/linux.yml    | 5 +++++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/src/devtools/automation/autospider.py b/js/src/devtools/automation/autospider.py
index 5d7de891daa7..71720a3929aa 100755
--- a/js/src/devtools/automation/autospider.py
+++ b/js/src/devtools/automation/autospider.py
@@ -455,6 +455,7 @@ else:
 
 if use_minidump:
     env.setdefault("MINIDUMP_SAVE_PATH", env["MOZ_UPLOAD_DIR"])
+    env.setdefault("DUMP_SYMS", os.path.join(DIR.fetches, "dump_syms", "dump_syms"))
     injector_lib = None
     if platform.system() == "Linux":
         injector_lib = os.path.join(
@@ -518,13 +519,6 @@ if not args.nobuild:
 
     if use_minidump:
         # Convert symbols to breakpad format.
-        hostdir = os.path.join(OBJDIR, "dist", "host", "bin")
-        if not os.path.isdir(hostdir):
-            os.makedirs(hostdir)
-        shutil.copy(
-            os.path.join(DIR.tooltool, "breakpad-tools", "dump_syms"),
-            os.path.join(hostdir, "dump_syms"),
-        )
         run_command(
             [
                 "make",
diff --git a/taskcluster/ci/spidermonkey/kind.yml b/taskcluster/ci/spidermonkey/kind.yml
index 5bc14842db75..59f2e8939722 100644
--- a/taskcluster/ci/spidermonkey/kind.yml
+++ b/taskcluster/ci/spidermonkey/kind.yml
@@ -67,6 +67,7 @@ job-defaults:
                     - linux64-clang
                     - linux64-gcc
                     - linux64-rust
+                    - linux64-dump-syms
 
 jobs-from:
     - linux.yml
diff --git a/taskcluster/ci/spidermonkey/linux.yml b/taskcluster/ci/spidermonkey/linux.yml
index 3e98e06ade70..6332c6ca867f 100644
--- a/taskcluster/ci/spidermonkey/linux.yml
+++ b/taskcluster/ci/spidermonkey/linux.yml
@@ -96,6 +96,7 @@ sm-smoosh-linux64/debug:
             - linux64-gcc
             - linux64-rust
             - linux64-cbindgen
+            - linux64-dump-syms
     run-on-projects: ['mozilla-central']
 
 sm-smoosh-linux64/opt:
@@ -114,6 +115,7 @@ sm-smoosh-linux64/opt:
             - linux64-gcc
             - linux64-rust
             - linux64-cbindgen
+            - linux64-dump-syms
     run-on-projects: ['mozilla-central']
 
 sm-warp-linux64/debug:
@@ -177,6 +179,7 @@ sm-arm64-sim-cranelift-linux64/debug:
             - linux64-rust
             - linux64-rust-size
             - linux64-cbindgen
+            - linux64-dump-syms
     run-on-projects: ['mozilla-central']
 
 sm-asan-linux64/opt:
@@ -235,6 +238,7 @@ sm-tsan-linux64/opt:
             - linux64-binutils
             - linux64-clang
             - linux64-rust
+            - linux64-dump-syms
 
 sm-rootanalysis-linux64/debug:
     description: "Spidermonkey Root Analysis"
@@ -261,6 +265,7 @@ sm-nonunified-linux64/debug:
             - linux64-gcc
             - linux64-rust
             - linux64-cbindgen
+            - linux64-dump-syms
 
 sm-fuzzing-linux64/opt:
     description: "Spidermonkey Fuzzing"