Commit e11ae2a5 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

[test] Fix isolating symbolizer for ubsan

Bug: chromium:726584
Change-Id: I1d413b5568e533e4f517c0687716689dd15da70d
Reviewed-on: https://chromium-review.googlesource.com/723459
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: 's avatarJakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48645}
parent 33dbc65b
...@@ -106,6 +106,11 @@ template("v8_isolate_run") { ...@@ -106,6 +106,11 @@ template("v8_isolate_run") {
} else { } else {
use_external_startup_data = "0" use_external_startup_data = "0"
} }
if (is_ubsan_vptr) {
ubsan_vptr = "1"
} else {
ubsan_vptr = "0"
}
if (v8_use_snapshot) { if (v8_use_snapshot) {
use_snapshot = "true" use_snapshot = "true"
} else { } else {
...@@ -170,6 +175,8 @@ template("v8_isolate_run") { ...@@ -170,6 +175,8 @@ template("v8_isolate_run") {
"--config-variable", "--config-variable",
"target_arch=$target_arch", "target_arch=$target_arch",
"--config-variable", "--config-variable",
"ubsan_vptr=$ubsan_vptr",
"--config-variable",
"v8_use_external_startup_data=$use_external_startup_data", "v8_use_external_startup_data=$use_external_startup_data",
"--config-variable", "--config-variable",
"v8_use_snapshot=$use_snapshot", "v8_use_snapshot=$use_snapshot",
......
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
'--config-variable', 'sanitizer_coverage=<(sanitizer_coverage)', '--config-variable', 'sanitizer_coverage=<(sanitizer_coverage)',
'--config-variable', 'component=<(component)', '--config-variable', 'component=<(component)',
'--config-variable', 'target_arch=<(target_arch)', '--config-variable', 'target_arch=<(target_arch)',
'--config-variable', 'ubsan_vptr=0',
'--config-variable', 'v8_use_external_startup_data=<(v8_use_external_startup_data)', '--config-variable', 'v8_use_external_startup_data=<(v8_use_external_startup_data)',
'--config-variable', 'v8_use_snapshot=<(v8_use_snapshot)', '--config-variable', 'v8_use_snapshot=<(v8_use_snapshot)',
], ],
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
], ],
}, },
}], }],
['asan==1 or cfi_vptr==1 or msan==1 or tsan==1', { ['asan==1 or cfi_vptr==1 or msan==1 or tsan==1 or ubsan_vptr==1', {
'variables': { 'variables': {
'files': [ 'files': [
'../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUTABLE_SUFFIX)', '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUTABLE_SUFFIX)',
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
}, },
}], }],
# Workaround for https://code.google.com/p/swarming/issues/detail?id=211 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211
['asan==0 or cfi_vptr==0 or msan==0 or tsan==0', { ['asan==0 or cfi_vptr==0 or msan==0 or tsan==0 or ubsan_vptr==0 ', {
'variables': {}, 'variables': {},
}], }],
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment