Bug 1089022 - Give WebGL conf. tests a longer timeout. - r=kamidphish
authorJeff Gilbert <jgilbert@mozilla.com>
Wed, 15 Oct 2014 15:40:41 -0700
changeset 212577 b78755143fda5251681535317e61ddf79a194c96
parent 212576 5422ee0c1808856ace552e784447a039df823182
child 212578 f79c977e989b5240f297a186818bd928d276661b
push id27721
push usercbook@mozilla.com
push dateTue, 28 Oct 2014 14:55:05 +0000
treeherdermozilla-central@c0ddb1b098ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskamidphish
bugs1089022
milestone36.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 1089022 - Give WebGL conf. tests a longer timeout. - r=kamidphish
dom/canvas/test/webgl-conformance/mochi-single.html
--- a/dom/canvas/test/webgl-conformance/mochi-single.html
+++ b/dom/canvas/test/webgl-conformance/mochi-single.html
@@ -49,18 +49,19 @@ if (!window.ok) {
 }
 if (!window.todo) {
   window.todo = function(status, message) {
     console.log('todo(' + status + ', \'' + message + '\')');
   }
 }
 if (!window.SimpleTest) {
   window.SimpleTest = {
+    finish: function(){},
+    requestLongerTimeout: function(){},
     waitForExplicitFinish: function(){},
-    finish: function(){},
   };
 }
 
 ////////////////////////////////////////////////////////////////////////
 // Implement our own version of `fail-if` expected failure handling.
 // `fail-if` in mochitest.ini doesn't work yet. (bug 987849)
 
 var OS_VERSION_WIN7 = 6.1;
@@ -238,16 +239,23 @@ function OnTestComplete() {
   SimpleTest.finish();
 }
 
 ////////////////////////////////////////////////////////////////////////
 // Begin execution
 
 SimpleTest.waitForExplicitFinish();
 
+var isAndroid2_3 = (DriverInfo.getOS() == DriverInfo.OS.ANDROID &&
+                    DriverInfo.getOSVersion() < OS_VERSION_ANDROID_ICS);
+if (isAndroid2_3) {
+  var timeoutLengthMultiplier = 2.0;
+  SimpleTest.requestLongerTimeout(timeoutLengthMultiplier);
+}
+
 do {
   var arg = location.search.substr(1);
   if (arg == 'dump') {
     statusElem.innerHTML = 'Dumping';
 
     ok(true, 'OS:' + DriverInfo.getOS());
     ok(true, 'OS version:' + DriverInfo.getOSVersion());
     ok(true, 'Driver:' + DriverInfo.getDriver());