AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change some instances of whitelist/blacklist

Browse Source 
Bug: chromium:1101491
Bug: b/161896447

Change-Id: I7e3bf4ed63b2170fb08fe1ec8e7d934e7fcdca7c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/306644
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2020-07-29 14:45:47 -04:00 committed by Skia Commit-Bot
parent 2d37958b2d
commit 5ba6534884
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gn/gn_to_bp_utils.py
View File

@ -37,8 +37,8 @@ def GrabDependentValues(js, name, value_type, list_to_extend, exclude):
for dep in js['targets'][name]['deps']: for dep in js['targets'][name]['deps']:
if 'modules' in dep: if 'modules' in dep:
skip = True skip = True
for white_list in ['skshaper', 'skparagraph']: for include in ['skshaper', 'skparagraph']:
if white_list in dep: if include in dep:
skip = False skip = False
if skip: if skip:
continue # Modules require special handling -- skip for now. continue # Modules require special handling -- skip for now.

4
infra/bots/gen_tasks_logic/nano_flags.go
View File

@ -289,7 +289,7 @@ func (b *taskBuilder) nanobenchFlags(doUpload bool) {
} }
if doUpload { if doUpload {
keysBlacklist := map[string]bool{ keysExclude := map[string]bool{
"configuration": true, "configuration": true,
"role": true, "role": true,
"test_filter": true, "test_filter": true,
@ -301,7 +301,7 @@ func (b *taskBuilder) nanobenchFlags(doUpload bool) {
sort.Strings(keys) sort.Strings(keys)
args = append(args, "--key") args = append(args, "--key")
for _, k := range keys { for _, k := range keys {
if !keysBlacklist[k] { if !keysExclude[k] {
args = append(args, k, b.parts[k]) args = append(args, k, b.parts[k])
} }
} }

12
infra/bots/recipes/perf_skottiewasm_lottieweb.py
View File

@ -26,7 +26,7 @@ DEPS = [
'vars', 'vars',
] ]
LOTTIE_WEB_BLACKLIST = [ LOTTIE_WEB_EXCLUDE = [
# See https://bugs.chromium.org/p/skia/issues/detail?id=9187#c4 # See https://bugs.chromium.org/p/skia/issues/detail?id=9187#c4
'lottiefiles.com - Progress Success.json', 'lottiefiles.com - Progress Success.json',
# Fails with "val2 is not defined". # Fails with "val2 is not defined".
@ -44,7 +44,7 @@ LOTTIE_WEB_BLACKLIST = [
'stacking.json', 'stacking.json',
] ]
SKOTTIE_WASM_BLACKLIST = [ SKOTTIE_WASM_EXCLUDE = [
# Trace file has majority main_frame_aborted terminations in it and < 25 # Trace file has majority main_frame_aborted terminations in it and < 25
# occurrences of submitted_frame + missed_frame. # occurrences of submitted_frame + missed_frame.
# Below descriptions are added from fmalita@'s comments in # Below descriptions are added from fmalita@'s comments in
@ -73,7 +73,7 @@ SKOTTIE_WASM_BLACKLIST = [
] ]
# These files work in SVG but not in Canvas. # These files work in SVG but not in Canvas.
LOTTIE_WEB_CANVAS_BLACKLIST = LOTTIE_WEB_BLACKLIST + [ LOTTIE_WEB_CANVAS_EXCLUDE = LOTTIE_WEB_EXCLUDE + [
'Hello World.json', 'Hello World.json',
'interactive_menu.json', 'interactive_menu.json',
'Name.json', 'Name.json',
@ -104,7 +104,7 @@ def RunSteps(api):
'--canvaskit_wasm', canvaskit_wasm_path, '--canvaskit_wasm', canvaskit_wasm_path,
] ]
lottie_files = [x for x in lottie_files lottie_files = [x for x in lottie_files
if api.path.basename(x) not in SKOTTIE_WASM_BLACKLIST] if api.path.basename(x) not in SKOTTIE_WASM_EXCLUDE]
elif 'LottieWeb' in buildername: elif 'LottieWeb' in buildername:
source_type = 'lottie-web' source_type = 'lottie-web'
renderer = 'lottie-web' renderer = 'lottie-web'
@ -112,11 +112,11 @@ def RunSteps(api):
backend = 'canvas' backend = 'canvas'
lottie_files = [ lottie_files = [
x for x in lottie_files x for x in lottie_files
if api.path.basename(x) not in LOTTIE_WEB_CANVAS_BLACKLIST] if api.path.basename(x) not in LOTTIE_WEB_CANVAS_EXCLUDE]
else: else:
backend = 'svg' backend = 'svg'
lottie_files = [x for x in lottie_files lottie_files = [x for x in lottie_files
if api.path.basename(x) not in LOTTIE_WEB_BLACKLIST] if api.path.basename(x) not in LOTTIE_WEB_EXCLUDE]
perf_app_dir = checkout_root.join('skia', 'tools', 'lottie-web-perf') perf_app_dir = checkout_root.join('skia', 'tools', 'lottie-web-perf')
lottie_web_js_path = perf_app_dir.join('lottie-web-perf.js') lottie_web_js_path = perf_app_dir.join('lottie-web-perf.js')

2
src/core/SkFuzzLogging.h
View File

@ -11,7 +11,7 @@
// Utilities for Skia's fuzzer // Utilities for Skia's fuzzer
// When SK_FUZZ_LOGGING is defined SkDebugfs relevant to image filter fuzzing // When SK_FUZZ_LOGGING is defined SkDebugfs relevant to image filter fuzzing
// will be enabled. This allows the filter fuzzing code to white list fuzzer // will be enabled. This allows the filter fuzzing code to include fuzzer
// failures based on the output logs. // failures based on the output logs.
// Define this flag in your SkUserConfig.h or in your Make/Build system. // Define this flag in your SkUserConfig.h or in your Make/Build system.
#ifdef SK_FUZZ_LOGGING #ifdef SK_FUZZ_LOGGING