diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-06-07 14:46:07 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-07 19:12:11 +0000 |
| commit | 61201641383dada029f79be4df98d925efc1a827 (patch) | |
| tree | 10ca15f417a0b47baaabf6df22158ed247379685 /infra/bots/recipes | |
| parent | fa8ff09457f82119be0d00b7f37afb790487819e (diff) | |
remove "srgb" config from DM,nanobench
Now that "srgb" is broken I don't want to accidentally run it.
"srgbnl" if of course identical, and not broken so much as
simply not yet working. :)
While here, simplify the configs we run in nanobench too, eliminating
565 and moving F16 to GCE-only (i.e. fast, abundant machines).
Similarly, remove "adobe" VIA that doesn't use Adobe RGB correctly...
Change-Id: Ic295dec97a2caadadbe8500655243db36dd2c43d
Reviewed-on: https://skia-review.googlesource.com/132932
Commit-Queue: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Mike Klein <mtklein@chromium.org>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'infra/bots/recipes')
9 files changed, 1 insertions, 14 deletions
diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json index a305a986b0..ef18e8fc56 100644 --- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json +++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json @@ -150,8 +150,6 @@ "8888", "nonrendering", "f16", - "srgb", - "565", "--match", "~^floor2int_undef$", "~inc0.gif", diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index db7a96729f..da9afbf3fd 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -60,12 +60,8 @@ def nanobench_flags(api, bot): args.append('--nogpu') configs.extend(['8888', 'nonrendering']) - if '-arm-' not in bot: - # For Android CPU tests, these take too long and cause the task to time - # out. - configs += [ 'f16', 'srgb' ] if '-GCE-' in bot: - configs += [ '565' ] + configs += [ 'f16' ] elif api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU': args.append('--nocpu') diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json index 2e3a57a7e6..8f3549533d 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json @@ -184,7 +184,6 @@ "f16", "lite-8888", "gbr-8888", - "srgb", "srgbnl", "esrgb", "t8888", diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json index 88d4a45b3b..f00cfeb3c6 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json @@ -183,7 +183,6 @@ "f16", "lite-8888", "gbr-8888", - "srgb", "srgbnl", "esrgb", "t8888", diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index 0f1934c743..ccbc17b215 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -266,7 +266,6 @@ "f16", "lite-8888", "gbr-8888", - "srgb", "srgbnl", "esrgb", "serialize-8888", diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json index 1aef121663..f499bc0bb6 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json @@ -189,7 +189,6 @@ "f16", "lite-8888", "gbr-8888", - "srgb", "srgbnl", "esrgb", "serialize-8888", diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json index 8aa3934778..45d7adf0de 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json @@ -184,7 +184,6 @@ "f16", "lite-8888", "gbr-8888", - "srgb", "srgbnl", "esrgb", "t8888", diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json index 458f9a2149..5a0d0969cb 100644 --- a/infra/bots/recipes/test.expected/failed_dm.json +++ b/infra/bots/recipes/test.expected/failed_dm.json @@ -262,7 +262,6 @@ "f16", "lite-8888", "gbr-8888", - "srgb", "srgbnl", "esrgb", "serialize-8888", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index f41955009c..53ae495c92 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -118,7 +118,6 @@ def dm_flags(api, bot): configs.extend(['f16']) configs.extend(['lite-8888']) # Experimental display list. configs.extend(['gbr-8888']) - configs.extend(['srgb']) configs.extend(['srgbnl']) configs.extend(['esrgb']) |