[sparkplug] Disable baseline tests under CFI

Add a .status file variable for the "v8_control_flow_integrity" gn arg,
and disable baseline tests for now in that configuration.

No-Tree-Checks: true
No-Try: true
Bug: v8:11439
Change-Id: I7274a168893cfd6619ce98fdd14a692217fd56c9
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2692206
Commit-Queue: Leszek Swirski <leszeks@chromium.org>
Auto-Submit: Leszek Swirski <leszeks@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72698}
This commit is contained in:
Leszek Swirski 2021-02-12 14:45:47 +01:00 committed by Commit Bot
parent cf7cba8d61
commit def5e9c364
5 changed files with 14 additions and 2 deletions

View File

@ -1840,6 +1840,7 @@ action("v8_dump_build_config") {
"v8_enable_verify_csa=$v8_enable_verify_csa",
"v8_enable_lite_mode=$v8_enable_lite_mode",
"v8_enable_pointer_compression=$v8_enable_pointer_compression",
"v8_control_flow_integrity=$v8_control_flow_integrity",
"v8_target_cpu=\"$v8_target_cpu\"",
]

View File

@ -272,6 +272,7 @@
'stack-traces-overflow': [SKIP],
'unicode-test': [SKIP],
'whitespaces': [SKIP],
'baseline/*': [SKIP],
# Unsuitable for GC stress because coverage information is lost on GC.
'code-coverage-ad-hoc': [SKIP],
@ -1459,5 +1460,9 @@
['arch not in (x64, arm64)', {
'baseline/*': [SKIP],
}],
# TODO(v8:11439): test-baseline is broken under CFI.
['control_flow_integrity', {
'baseline/*': [SKIP],
}],
]

View File

@ -170,6 +170,7 @@ class BuildConfig(object):
self.asan = build_config['is_asan']
self.cfi_vptr = build_config['is_cfi']
self.control_flow_integrity = build_config['v8_control_flow_integrity']
self.concurrent_marking = build_config['v8_enable_concurrent_marking']
self.dcheck_always_on = build_config['dcheck_always_on']
self.gcov_coverage = build_config['is_gcov_coverage']
@ -205,6 +206,8 @@ class BuildConfig(object):
detected_options.append('asan')
if self.cfi_vptr:
detected_options.append('cfi_vptr')
if self.control_flow_integrity:
detected_options.append('control_flow_integrity')
if self.dcheck_always_on:
detected_options.append('dcheck_always_on')
if self.gcov_coverage:
@ -645,6 +648,7 @@ class BaseTestRunner(object):
"asan": self.build_config.asan,
"byteorder": sys.byteorder,
"cfi_vptr": self.build_config.cfi_vptr,
"control_flow_integrity": self.build_config.control_flow_integrity,
"concurrent_marking": self.build_config.concurrent_marking,
"dcheck_always_on": self.build_config.dcheck_always_on,
"deopt_fuzzer": False,

View File

@ -20,5 +20,6 @@
"v8_enable_concurrent_marking": true,
"v8_enable_verify_csa": false,
"v8_enable_lite_mode": false,
"v8_enable_pointer_compression": true
"v8_enable_pointer_compression": true,
"v8_control_flow_integrity": false
}

View File

@ -20,5 +20,6 @@
"v8_enable_concurrent_marking": true,
"v8_enable_verify_csa": false,
"v8_enable_lite_mode": false,
"v8_enable_pointer_compression": false
"v8_enable_pointer_compression": false,
"v8_control_flow_integrity": false
}