Bug 1031097 - Follow-up to handle llvmpipe in Android emulator GL renderer string; r=jgilbert
authorGeoff Brown <gbrown@mozilla.com>
Mon, 30 Jun 2014 17:07:59 -0600
changeset 191628 716cecc3c0b49cd414fc22330cfdc5a9a1c16cc8
parent 191627 51879554acf402cda5512c821c97013288d8bea1
child 191629 01aca028ba9d6ffdcbf2cd68df06cbd9f4451c46
push id27055
push usercbook@mozilla.com
push dateTue, 01 Jul 2014 12:01:46 +0000
treeherdermozilla-central@4a9353b5762d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1031097
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1031097 - Follow-up to handle llvmpipe in Android emulator GL renderer string; r=jgilbert
content/canvas/test/webgl-conformance/test_webgl_conformance_test_suite.html
--- a/content/canvas/test/webgl-conformance/test_webgl_conformance_test_suite.html
+++ b/content/canvas/test/webgl-conformance/test_webgl_conformance_test_suite.html
@@ -106,20 +106,20 @@ function start() {
     kOS = OS_LINUX;
   }
   
   var glVendor, glRenderer;
   [glVendor, glRenderer] = detectDriverInfo();
   info('GL vendor: ' + glVendor);
   info('GL renderer: ' + glRenderer);
   
-  if (glRenderer.contains('llvmpipe')) {
+  if (glRenderer.contains('Android Emulator')) {
+    kGLDriver = GLDRIVER_X86EMULATOR;
+  } else if (glRenderer.contains('llvmpipe')) {
     kGLDriver = GLDRIVER_MESA;
-  } else if (glRenderer.contains('Android Emulator')) {
-    kGLDriver = GLDRIVER_X86EMULATOR;
   } else if (glVendor.contains('NVIDIA')) {
     kGLDriver = GLDRIVER_NVIDIA;
   }
   
   if (kOS) {
     info('OS detected as: ' + kOS);
     info('  Version: ' + kOSVersion);
   } else {
@@ -527,20 +527,16 @@ function start() {
         case GLDRIVER_NVIDIA:
           failingTestsFilename = 'failing_tests_android_nvidia.txt';
           skippedTestsFilename = 'skipped_tests_android.txt';
           break;
         case GLDRIVER_X86EMULATOR:
           failingTestsFilename = 'failing_tests_android_x86.txt';
           skippedTestsFilename = 'skipped_tests_android_x86.txt';
           break;
-        case GLDRIVER_MESA:
-          failingTestsFilename = 'failing_tests_android_x86.txt';
-          skippedTestsFilename = 'skipped_tests_android_x86.txt';
-          break;
         default:
           failingTestsFilename = 'failing_tests_android.txt';
           skippedTestsFilename = 'skipped_tests_android.txt';
           break;
       }
       break;
     }
   }