diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2017-12-04 11:15:58 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-04 17:08:09 +0000 |
| commit | bee6cacc54357e0af1de67d527fe51eb3602c2d6 (patch) | |
| tree | c7116187f78aaf8c99a3764947d4c77421f75522 /infra/bots/recipe_modules/flavor/gn_flavor.py | |
| parent | e7d8da4b20babbe17abc8f95dd2dea56ee8f9af5 (diff) | |
Merge UBSAN_float_cast_overflow into ASAN.
The new check was a different config while we fixed the errors. Most
errors are now fixed, and merging these will help with running both on
the CQ.
No-Try: true
Change-Id: I5804ecea84a8dbbaacf6a4ea96e2af9505641d49
Reviewed-on: https://skia-review.googlesource.com/79323
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'infra/bots/recipe_modules/flavor/gn_flavor.py')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_flavor.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 43d78c9f4b..971ed6ca1f 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -132,9 +132,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): }) sanitize = '' - if extra_config == 'UBSAN_float_cast_overflow': - sanitize = 'float-cast-overflow' - elif 'SAN' in extra_config: + if 'SAN' in extra_config: sanitize = extra_config elif 'SafeStack' in extra_config: sanitize = 'safe-stack' |