Symbolize all Ubuntu dm/nanobench runs

BUG=skia:6206

Change-Id: Ic73b04ee832c7c603a032c5726b34ecb3ac3b4ff
Reviewed-on: https://skia-review.googlesource.com/9131
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>

15 files changed, 68 insertions, 16 deletions

diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index 6e3f68409f..af20893dd9 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -161,7 +161,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
       env['LD_LIBRARY_PATH'] = clang_linux + '/msan'
 
     to_symbolize = ['dm', 'nanobench']
-    if name in to_symbolize and 'Ubuntu16' == self.m.vars.builder_cfg['os']:
+    if name in to_symbolize and 'Ubuntu' in self.m.vars.builder_cfg['os']:
       # Convert path objects or placeholders into strings such that they can
       # be passed to symbolize_stack_trace.py
       args = [self.m.vars.slave_dir] + [str(x) for x in cmd]
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
index 52e0017e60..dfa61a5db1 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
@@ -105,6 +105,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Release/nanobench",
       "--undefok",
@@ -181,7 +185,7 @@
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[START_DIR]/out"
     },
-    "name": "nanobench"
+    "name": "symbolized nanobench"
   },
   {
     "cmd": [
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json
index a6ecfbbd86..68a990c30e 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json
@@ -105,6 +105,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Release/nanobench",
       "--undefok",
@@ -185,7 +189,7 @@
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[START_DIR]/out"
     },
-    "name": "nanobench"
+    "name": "symbolized nanobench"
   },
   {
     "cmd": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
index d50ec58c6a..a81925781c 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
@@ -175,6 +175,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
@@ -522,7 +526,7 @@
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[START_DIR]/out"
     },
-    "name": "dm"
+    "name": "symbolized dm"
   },
   {
     "name": "$result",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
index 5e6bd8bb96..4e4eae6a1b 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
@@ -61,6 +61,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
       "--resourcePath",
@@ -407,7 +411,7 @@
       "SKIA_OUT": "[START_DIR]/out",
       "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1"
     },
-    "name": "dm"
+    "name": "symbolized dm"
   },
   {
     "name": "$result",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
index b48160e4d7..f5d48a4a56 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@@ -61,6 +61,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
       "--resourcePath",
@@ -408,7 +412,7 @@
       "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin",
       "SKIA_OUT": "[START_DIR]/out"
     },
-    "name": "dm"
+    "name": "symbolized dm"
   },
   {
     "name": "$result",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
index 9723400115..e68873f9ec 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -175,6 +175,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
@@ -520,7 +524,7 @@
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[START_DIR]/out"
     },
-    "name": "dm"
+    "name": "symbolized dm"
   },
   {
     "name": "$result",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
index 0bc6d73b5f..0e73d4ad6f 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
@@ -175,6 +175,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Release/dm",
       "--undefok",
@@ -522,7 +526,7 @@
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[START_DIR]/out"
     },
-    "name": "dm"
+    "name": "symbolized dm"
   },
   {
     "name": "$result",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
index bba45c1c69..cda4aa26a6 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
@@ -61,6 +61,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "[START_DIR]/out/Release/dm",
       "--undefok",
       "--resourcePath",
@@ -408,7 +412,7 @@
       "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin",
       "SKIA_OUT": "[START_DIR]/out"
     },
-    "name": "dm"
+    "name": "symbolized dm"
   },
   {
     "name": "$result",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
index 80e237ce81..42d9c0f320 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
@@ -175,6 +175,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
@@ -520,7 +524,7 @@
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[START_DIR]/out"
     },
-    "name": "dm",
+    "name": "symbolized dm",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_FAILURE@@@"
@@ -528,7 +532,7 @@
   },
   {
     "name": "$result",
-    "reason": "Failed build steps: dm, dm",
+    "reason": "Failed build steps: symbolized dm, symbolized dm",
     "recipe_result": null,
     "status_code": 1
   }
diff --git a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
index 2c5192076f..064a0e744e 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
@@ -203,6 +203,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
@@ -560,7 +564,7 @@
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[START_DIR]/out"
     },
-    "name": "dm"
+    "name": "symbolized dm"
   },
   {
     "name": "$result",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
index 30e76ad2a6..9abab39fc5 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
@@ -175,6 +175,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
@@ -526,7 +530,7 @@
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[START_DIR]/out"
     },
-    "name": "dm"
+    "name": "symbolized dm"
   },
   {
     "name": "$result",
diff --git a/infra/bots/recipe_modules/sktest/example.py b/infra/bots/recipe_modules/sktest/example.py
index 0da22f0cf8..fcbb41200b 100644
--- a/infra/bots/recipe_modules/sktest/example.py
+++ b/infra/bots/recipe_modules/sktest/example.py
@@ -118,7 +118,7 @@ def GenTests(api):
                                      'svg', 'VERSION'),
         api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt')
     ) +
-    api.step_data('dm', retcode=1)
+    api.step_data('symbolized dm', retcode=1)
   )
 
   builder = 'Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android'
diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json
index 4a31c25377..5958557fea 100644
--- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json
@@ -105,6 +105,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Release/nanobench",
       "--undefok",
@@ -179,7 +183,7 @@
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[START_DIR]/out"
     },
-    "name": "nanobench"
+    "name": "symbolized nanobench"
   },
   {
     "cmd": [
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
index 0714a75e54..728151994d 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
@@ -175,6 +175,10 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
@@ -522,7 +526,7 @@
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[START_DIR]/out"
     },
-    "name": "dm"
+    "name": "symbolized dm"
   },
   {
     "name": "$result",