Index: content/test/gpu/gpu_tests/gpu_process_expectations.py |
diff --git a/content/test/gpu/gpu_tests/gpu_process_expectations.py b/content/test/gpu/gpu_tests/gpu_process_expectations.py |
index d9f4b410f083e20137a2a343b5a9b8a971adb222..656f5728b7600d193f90f9c676478c70a67561c7 100644 |
--- a/content/test/gpu/gpu_tests/gpu_process_expectations.py |
+++ b/content/test/gpu/gpu_tests/gpu_process_expectations.py |
@@ -9,23 +9,21 @@ from gpu_tests.gpu_test_expectations import GpuTestExpectations |
class GpuProcessExpectations(GpuTestExpectations): |
def SetExpectations(self): |
# Accelerated 2D canvas is not available on Linux due to driver instability |
- self.Fail('GpuProcess.canvas2d', ['linux'], bug=254724) |
+ self.Fail('GpuProcess_canvas2d', ['linux'], bug=254724) |
- self.Fail('GpuProcess.video', ['linux'], bug=257109) |
+ self.Fail('GpuProcess_video', ['linux'], bug=257109) |
# Chrome on Android doesn't support software fallback. |
- self.Skip('GpuProcess.no_gpu_process', ['android'], bug=643282) |
- |
- # Nexus 5X |
- # Skip this test because expecting it to fail will still run it. |
- self.Skip('GpuProcess.skip_gpu_process', |
- ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951) |
- |
- # Nexus 9 |
- # Skip this test because expecting it to fail will still run it. |
- self.Skip('GpuProcess.skip_gpu_process', |
- ['android', 'nvidia'], bug=610023) |
- |
- # There are currently no blacklist entries disabling all GPU |
- # functionality on Mac OS. |
- self.Fail('GpuProcess.no_gpu_process', ['mac'], bug=579255) |
+ self.Skip('GpuProcess_no_gpu_process', ['android'], bug=643282) |
+ self.Skip('GpuProcess_skip_gpu_process', ['android'], bug=(610951, 610023)) |
+ |
+ # There is no Android multi-gpu configuration and the helper |
+ # gpu_info_collector.cc::IdentifyActiveGPU is not even called. |
+ self.Skip('GpuProcess_identify_active_gpu1', ['android']) |
+ self.Skip('GpuProcess_identify_active_gpu2', ['android']) |
+ self.Skip('GpuProcess_identify_active_gpu3', ['android']) |
+ self.Skip('GpuProcess_identify_active_gpu4', ['android']) |
+ |
+ # There is currently no entry in kSoftwareRenderingListJson that enables |
+ # a software GL driver on Android. |
+ self.Skip('GpuProcess_software_gpu_process', ['android']) |