From 8d4cbad13c3f54dbfd080931401d7b24e346822f Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Tue, 11 Apr 2017 08:51:33 -0400 Subject: [PATCH] Fix symbolization of ASAN crashes Bug: skia: Change-Id: Id127a3c4a1a40bc6ddb0641c9d72f1a5960bbc6e Reviewed-on: https://skia-review.googlesource.com/13125 Reviewed-by: Eric Boren Commit-Queue: Kevin Lubick --- infra/bots/recipe_modules/run/api.py | 8 ++++++++ ...16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json | 2 +- .../Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json | 2 +- .../Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json | 2 +- .../Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json | 2 +- ...16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/infra/bots/recipe_modules/run/api.py b/infra/bots/recipe_modules/run/api.py index 033cfc930c..475bd56d28 100644 --- a/infra/bots/recipe_modules/run/api.py +++ b/infra/bots/recipe_modules/run/api.py @@ -82,7 +82,15 @@ class SkiaStepApi(recipe_api.RecipeApi): fail_build_on_failure=True, **kwargs): """Run a step. If it fails, keep going but mark the build status failed.""" env = self.m.step.get_from_context('env', {}) + # If PATH is defined in both, merge them together, merging default_env into + # path by replacing %(PATH)s + path = env.get('PATH', '') env.update(self.m.vars.default_env) + default_path = self.m.vars.default_env.get('PATH', '') + if path and default_path and path != default_path: + path = path.replace(r'%(PATH)s', default_path) + env['PATH'] = path + try: with self.m.step.context({'env': env}): return steptype(name=name, **kwargs) diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json index 0e9791b2fe..7d80c46a32 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -146,7 +146,7 @@ "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_sdk/lib:[START_DIR]/linux_vulkan_intel_driver_debug", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", "SKIA_OUT": "[START_DIR]/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json index 2c1caabed5..16b542564a 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", "SKIA_OUT": "[START_DIR]/out", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index 286bcd813d..459ecd119a 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -453,7 +453,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json index b838c5c2e6..6b625c4c7c 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json @@ -453,7 +453,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json index 0647e3ad0f..3f1555e7a3 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -363,7 +363,7 @@ "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_sdk/lib:[START_DIR]/linux_vulkan_intel_driver_debug", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", "SKIA_OUT": "[START_DIR]/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, -- 2.34.1