Bug 629933 - WebGL mochitest mistakenly disabled on Mac OS 10.6 - r=vlad, a=obviously-should-be-blocking2.0
authorBenoit Jacob <bjacob@mozilla.com>
Sat, 29 Jan 2011 22:31:21 -0500
changeset 61601 dd5e9bfd0f6aade836e51f6a7242927441106d9d
parent 61600 e0cc3c15ef087fccbcede7409fcc6c2d66a85600
child 61611 aecb4a72e8d81d07fa00bb1e2e3ec4eafaf5f84b
push id18405
push userbjacob@mozilla.com
push dateSat, 29 Jan 2011 22:32:21 +0000
treeherdermozilla-central@dd5e9bfd0f6a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvlad, obviously-should-be-blocking2.0
bugs629933
milestone2.0b11pre
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 629933 - WebGL mochitest mistakenly disabled on Mac OS 10.6 - r=vlad, a=obviously-should-be-blocking2.0
content/canvas/test/webgl/test_webgl_conformance_test_suite.html
--- a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
+++ b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
@@ -367,19 +367,22 @@ function start() {
   // due to various weird failures, including one making getRenderbufferParameter tests
   // on DEPTH_STENCIL fail
   if (kIsMac) {
     // code borrowed from browser/components/wintaskbar/test/browser_taskbar_preview.js
     var is106orHigher = false;
     try {
       netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
       var version = Components.classes["@mozilla.org/system-info;1"]
-                              .getService(Components.interfaces.nsIPropertyBag2)
-                              .getProperty("version");
-      is106orHigher = (parseFloat(version) >= 10.6);
+                              .getService(Components.interfaces.nsIPropertyBag2)
+                              .getProperty("version");
+      // the next line is correct: Mac OS 10.6 corresponds to Darwin version 10 !
+      // Mac OS 10.5 would be Darwin version 9. the |version| string we've got here
+      // is the Darwin version.
+      is106orHigher = (parseFloat(version) >= 10.0);
     } catch (ex) { }
     if (!is106orHigher) {
       dump("WebGL mochitest disabled on Mac OSX versions older than 10.6");
       SimpleTest.finish();
       return;
     }
   }