Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Unified Diff: content/test/gpu/gpu_tests/gpu_test_expectations.py

Issue 1361763002: Update WebGL 2 conformance test expectations for Linux AMD bot. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/test/gpu/gpu_tests/webgl_conformance_expectations.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/gpu/gpu_tests/gpu_test_expectations.py
diff --git a/content/test/gpu/gpu_tests/gpu_test_expectations.py b/content/test/gpu/gpu_tests/gpu_test_expectations.py
index 196c7b68c1bae3c1a4168c6070475fb5756f83a9..53bf1d0e13c1f5dd63612c1a604a79ba43fc6662 100644
--- a/content/test/gpu/gpu_tests/gpu_test_expectations.py
+++ b/content/test/gpu/gpu_tests/gpu_test_expectations.py
@@ -101,14 +101,14 @@ class GpuTestExpectations(test_expectations.TestExpectations):
if primary_gpu:
vendor_string = primary_gpu.vendor_string.lower()
vendor_id = primary_gpu.vendor_id
- if vendor_string:
- return vendor_string.split(' ')[0]
- elif vendor_id == 0x10DE:
+ if vendor_id == 0x10DE:
return 'nvidia'
elif vendor_id == 0x1002:
return 'amd'
elif vendor_id == 0x8086:
return 'intel'
+ elif vendor_string:
+ return vendor_string.split(' ')[0]
return 'unknown_gpu'
def _GetGpuDeviceId(self, gpu_info):
« no previous file with comments | « no previous file | content/test/gpu/gpu_tests/webgl_conformance_expectations.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698