diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-05-25 07:56:01 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-25 12:42:36 +0000 |
| commit | 985e1921719bac87a35523a2432f47233f46df9e (patch) | |
| tree | ee6a057379638ee1ad8df1c9bb5617bf349ac2cd /infra/bots/recipes | |
| parent | 6533159f2c83d0af51f79c3d85461580e2346080 (diff) | |
Rename HD4000 GPU to IntelHD4000 on bots
This is so the blanket disabling of MSAA on Intel bots (in test.py & perf.py) actually disables it on the HD4000.
Change-Id: Ief3c0c85ed53e312f5e584ab51ba76f78fb8c036
Reviewed-on: https://skia-review.googlesource.com/17822
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'infra/bots/recipes')
| -rw-r--r-- | infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json (renamed from infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json) | 0 | ||||
| -rw-r--r-- | infra/bots/recipes/perf.py | 2 | ||||
| -rw-r--r-- | infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json (renamed from infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json) | 4 | ||||
| -rw-r--r-- | infra/bots/recipes/test.py | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json index ae906ae3e4..ae906ae3e4 100644 --- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index 987d44a154..c2ab35df47 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -337,7 +337,7 @@ TEST_BUILDERS = [ 'Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug', 'Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release', 'Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release', - 'Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer', + 'Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer', 'Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release', 'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind', ('Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind' + diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json index ad6ce5cdd6..b5e2a0e099 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json @@ -219,7 +219,7 @@ "gitHash", "abc123", "builder", - "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer", + "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer", "swarming_bot_id", "skia-bot-123", "swarming_task_id", @@ -236,7 +236,7 @@ "cpu_or_gpu", "GPU", "cpu_or_gpu_value", - "HD4000", + "IntelHD4000", "extra_config", "CommandBuffer", "model", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 5e008f3e0d..19d467859b 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -70,7 +70,7 @@ def dm_flags(bot): 'iPhone6' in bot or 'iPhone7' in bot or # skia:5792 - 'iHD530' in bot or + 'IntelHD530' in bot or 'IntelIris540' in bot): configs = [x for x in configs if 'msaa' not in x] @@ -751,7 +751,7 @@ TEST_BUILDERS = [ 'Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android', 'Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug', 'Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug', - 'Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer', + 'Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer', 'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN', 'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN', 'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN', |