diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2017-08-10 12:22:56 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-10 19:02:06 +0000 |
| commit | 6da8f796183161481d3c0677e6c7217e0ad1852a (patch) | |
| tree | 5ac77b664f1c3c324b5947cdcbc79acd3f133427 | |
| parent | 8c326e9b81a5f314832b6a48df5602d79cb222b5 (diff) | |
Fix undefined flag for MSAN.
MSAN started failing after https://skia-review.googlesource.com/c/32722.
This should fix it.
No-Try: true
Change-Id: I8956c8c211507923f078fe96921fedaadefae8a8
Reviewed-on: https://skia-review.googlesource.com/32942
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
| -rw-r--r-- | infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json | 1 | ||||
| -rw-r--r-- | infra/bots/recipes/test.py | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index 57c09bc115..03c6f9140d 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -158,7 +158,6 @@ "--nogpu", "--dont_write", "pdf", - "--randomProcessorTest", "--config", "8888", "srgb", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index a34cfbae82..2eb8f4e13f 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -33,12 +33,16 @@ def dm_flags(api, bot): # This enables non-deterministic random seeding of the GPU FP optimization # test. - # Not Android due to : + # Not Android due to: # - https://skia.googlesource.com/skia/+/ # 5910ed347a638ded8cd4c06dbfda086695df1112/BUILD.gn#160 # - https://skia.googlesource.com/skia/+/ # ce06e261e68848ae21cac1052abc16bc07b961bf/tests/ProcessorTest.cpp#307 - if 'Android' not in bot: + # Not MSAN due to: + # - https://skia.googlesource.com/skia/+/ + # 0ac06e47269a40c177747310a613d213c95d1d6d/infra/bots/recipe_modules/ + # flavor/gn_flavor.py#80 + if 'Android' not in bot and 'MSAN' not in bot: args.append('--randomProcessorTest') # 32-bit desktop bots tend to run out of memory, because they have relatively |