diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/testing/test_env.py | |
parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/testing/test_env.py')
-rwxr-xr-x | chromium/testing/test_env.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/chromium/testing/test_env.py b/chromium/testing/test_env.py index 052df6769b2..7d72169d235 100755 --- a/chromium/testing/test_env.py +++ b/chromium/testing/test_env.py @@ -65,8 +65,8 @@ def get_sanitizer_env(cmd, asan, lsan, msan, tsan): # TODO(glider): remove the symbolizer path once # https://code.google.com/p/address-sanitizer/issues/detail?id=134 is fixed. - symbolizer_path = os.path.abspath(os.path.join(ROOT_DIR, 'third_party', - 'llvm-build', 'Release+Asserts', 'bin', 'llvm-symbolizer')) + symbolizer_path = os.path.join(ROOT_DIR, + 'third_party', 'llvm-build', 'Release+Asserts', 'bin', 'llvm-symbolizer') if lsan or tsan: # LSan is not sandbox-compatible, so we can use online symbolization. In @@ -125,7 +125,8 @@ def get_sanitizer_env(cmd, asan, lsan, msan, tsan): def get_sanitizer_symbolize_command(json_path=None, executable_path=None): """Construct the command to invoke offline symbolization script.""" - script_path = '../tools/valgrind/asan/asan_symbolize.py' + script_path = os.path.join( + ROOT_DIR, 'tools', 'valgrind', 'asan', 'asan_symbolize.py') cmd = [sys.executable, script_path] if json_path is not None: cmd.append('--test-summary-json-file=%s' % json_path) @@ -155,11 +156,13 @@ def symbolize_snippets_in_json(cmd, env): p = subprocess.Popen(symbolize_command, stderr=subprocess.PIPE, env=env) (_, stderr) = p.communicate() except OSError as e: - print 'Exception while symbolizing snippets: %s' % e + print >> sys.stderr, 'Exception while symbolizing snippets: %s' % e + raise if p.returncode != 0: - print "Error: failed to symbolize snippets in JSON:\n" - print stderr + print >> sys.stderr, "Error: failed to symbolize snippets in JSON:\n" + print >> sys.stderr, stderr + raise subprocess.CalledProcessError(p.returncode, symbolize_command) def run_executable(cmd, env): |