Backed out changeset 2dd8e4e95c55 (bug 1052240)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 25 Aug 2014 14:10:14 +0200
changeset 222987 f0592de4261c6f90a0731c4b9b65bae0060f12e3
parent 222986 0adf0a108a7f7335cf5d3519d318528a75fbd56d
child 222988 c22358426fd3977d63ff08ca12aa32064b322b1f
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1052240
milestone34.0a1
backs out2dd8e4e95c55256c0c65be8a24b5c9bd3cb87261
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
Backed out changeset 2dd8e4e95c55 (bug 1052240)
dom/canvas/test/webgl-conformance/00_test_list.txt
dom/canvas/test/webgl-conformance/_mochitest.ini
dom/canvas/test/webgl-conformance/_wrappers/test_always-fail.html
dom/canvas/test/webgl-conformance/always-fail.html
dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py
dom/canvas/test/webgl-conformance/mochi-single.html
dom/canvas/test/webgl-conformance/mochitest-errata.ini
dom/canvas/test/webgl-conformance/mochitest.ini.template
--- a/dom/canvas/test/webgl-conformance/00_test_list.txt
+++ b/dom/canvas/test/webgl-conformance/00_test_list.txt
@@ -1,8 +1,6 @@
 // files that end in .txt list other tests
 // other lines are assumed to be .html files
 
-always-fail.html
-
 conformance/00_test_list.txt
 conformance/more/00_test_list.txt
 
--- a/dom/canvas/test/webgl-conformance/_mochitest.ini
+++ b/dom/canvas/test/webgl-conformance/_mochitest.ini
@@ -1,14 +1,12 @@
 [DEFAULT]
-skip-if = e10s || ((os == 'linux') && (buildapp == 'b2g'))
-
+skip-if = e10s
 support-files = mochi-single.html
                 mochi-wrapper.css
-                always-fail.html
                 conformance/00_readme.txt
                 conformance/00_test_list.txt
                 conformance/LICENSE_CHROMIUM
                 conformance/attribs/00_test_list.txt
                 conformance/attribs/gl-enable-vertex-attrib.html
                 conformance/attribs/gl-vertex-attrib-zero-issues.html
                 conformance/attribs/gl-vertex-attrib.html
                 conformance/attribs/gl-vertexattribpointer-offsets.html
@@ -474,17 +472,16 @@ support-files = mochi-single.html
                 resources/desktop-gl-constants.js
                 resources/js-test-pre.js
                 resources/js-test-style.css
                 resources/opengl_logo.jpg
                 resources/thunderbird-logo-64x64.png
                 resources/webgl-logo.png
                 resources/webgl-test-harness.js
 
-[_wrappers/test_always-fail.html]
 [_wrappers/test_conformance__attribs__gl-enable-vertex-attrib.html]
 [_wrappers/test_conformance__attribs__gl-vertex-attrib-zero-issues.html]
 [_wrappers/test_conformance__attribs__gl-vertex-attrib.html]
 [_wrappers/test_conformance__attribs__gl-vertexattribpointer-offsets.html]
 [_wrappers/test_conformance__attribs__gl-vertexattribpointer.html]
 [_wrappers/test_conformance__buffers__buffer-bind-test.html]
 [_wrappers/test_conformance__buffers__buffer-data-array-buffer.html]
 [_wrappers/test_conformance__buffers__index-validation-copies-indices.html]
@@ -496,17 +493,16 @@ support-files = mochi-single.html
 [_wrappers/test_conformance__canvas__buffer-preserve-test.html]
 [_wrappers/test_conformance__canvas__canvas-test.html]
 [_wrappers/test_conformance__canvas__canvas-zero-size.html]
 [_wrappers/test_conformance__canvas__drawingbuffer-static-canvas-test.html]
 [_wrappers/test_conformance__canvas__drawingbuffer-test.html]
 [_wrappers/test_conformance__canvas__viewport-unchanged-upon-resize.html]
 [_wrappers/test_conformance__context__constants.html]
 [_wrappers/test_conformance__context__context-attributes-alpha-depth-stencil-antialias.html]
-skip-if = (os == 'b2g')
 [_wrappers/test_conformance__context__context-lost-restored.html]
 [_wrappers/test_conformance__context__context-lost.html]
 [_wrappers/test_conformance__context__context-type-test.html]
 [_wrappers/test_conformance__context__incorrect-context-object-behaviour.html]
 [_wrappers/test_conformance__context__methods.html]
 [_wrappers/test_conformance__context__premultiplyalpha-test.html]
 [_wrappers/test_conformance__context__resource-sharing-test.html]
 [_wrappers/test_conformance__extensions__oes-standard-derivatives.html]
@@ -686,40 +682,35 @@ skip-if = (os == 'b2g')
 [_wrappers/test_conformance__limits__gl-min-attribs.html]
 [_wrappers/test_conformance__limits__gl-max-texture-dimensions.html]
 [_wrappers/test_conformance__limits__gl-min-textures.html]
 [_wrappers/test_conformance__limits__gl-min-uniforms.html]
 [_wrappers/test_conformance__misc__bad-arguments-test.html]
 [_wrappers/test_conformance__misc__error-reporting.html]
 [_wrappers/test_conformance__misc__instanceof-test.html]
 [_wrappers/test_conformance__misc__invalid-passed-params.html]
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
 [_wrappers/test_conformance__misc__is-object.html]
 [_wrappers/test_conformance__misc__null-object-behaviour.html]
 [_wrappers/test_conformance__misc__functions-returning-strings.html]
 [_wrappers/test_conformance__misc__object-deletion-behaviour.html]
 [_wrappers/test_conformance__misc__shader-precision-format.html]
 [_wrappers/test_conformance__misc__type-conversion-test.html]
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
 [_wrappers/test_conformance__misc__uninitialized-test.html]
-skip-if = os == 'android'
 [_wrappers/test_conformance__misc__webgl-specific.html]
 [_wrappers/test_conformance__programs__get-active-test.html]
 [_wrappers/test_conformance__programs__gl-bind-attrib-location-test.html]
 [_wrappers/test_conformance__programs__gl-get-active-attribute.html]
 [_wrappers/test_conformance__programs__gl-get-active-uniform.html]
 [_wrappers/test_conformance__programs__gl-getshadersource.html]
 [_wrappers/test_conformance__programs__gl-shader-test.html]
 [_wrappers/test_conformance__programs__invalid-UTF-16.html]
 [_wrappers/test_conformance__programs__program-test.html]
 [_wrappers/test_conformance__reading__read-pixels-pack-alignment.html]
 [_wrappers/test_conformance__reading__read-pixels-test.html]
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
 [_wrappers/test_conformance__renderbuffers__framebuffer-object-attachment.html]
-skip-if = os == 'android'
 [_wrappers/test_conformance__renderbuffers__framebuffer-test.html]
 [_wrappers/test_conformance__renderbuffers__renderbuffer-initialization.html]
 [_wrappers/test_conformance__rendering__draw-arrays-out-of-bounds.html]
 [_wrappers/test_conformance__rendering__draw-elements-out-of-bounds.html]
 [_wrappers/test_conformance__rendering__gl-clear.html]
 [_wrappers/test_conformance__rendering__gl-drawelements.html]
 [_wrappers/test_conformance__rendering__gl-scissor-test.html]
 [_wrappers/test_conformance__rendering__more-than-65536-indices.html]
@@ -731,45 +722,38 @@ skip-if = os == 'android'
 [_wrappers/test_conformance__state__gl-get-calls.html]
 [_wrappers/test_conformance__state__gl-geterror.html]
 [_wrappers/test_conformance__state__gl-getstring.html]
 [_wrappers/test_conformance__state__gl-object-get-calls.html]
 [_wrappers/test_conformance__textures__compressed-tex-image.html]
 [_wrappers/test_conformance__textures__copy-tex-image-and-sub-image-2d.html]
 [_wrappers/test_conformance__textures__gl-pixelstorei.html]
 [_wrappers/test_conformance__textures__gl-teximage.html]
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
 [_wrappers/test_conformance__textures__origin-clean-conformance.html]
 [_wrappers/test_conformance__textures__tex-image-and-sub-image-2d-with-array-buffer-view.html]
 [_wrappers/test_conformance__textures__tex-image-and-sub-image-2d-with-canvas.html]
 [_wrappers/test_conformance__textures__tex-image-and-sub-image-2d-with-image-data.html]
 [_wrappers/test_conformance__textures__tex-image-and-sub-image-2d-with-image.html]
 [_wrappers/test_conformance__textures__tex-image-and-sub-image-2d-with-video.html]
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
 [_wrappers/test_conformance__textures__tex-image-and-uniform-binding-bugs.html]
-skip-if = (os == 'b2g')
 [_wrappers/test_conformance__textures__tex-image-with-format-and-type.html]
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
 [_wrappers/test_conformance__textures__tex-image-with-invalid-data.html]
 [_wrappers/test_conformance__textures__tex-input-validation.html]
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
 [_wrappers/test_conformance__textures__tex-sub-image-2d-bad-args.html]
 [_wrappers/test_conformance__textures__tex-sub-image-2d.html]
 [_wrappers/test_conformance__textures__texparameter-test.html]
 [_wrappers/test_conformance__textures__texture-active-bind-2.html]
 [_wrappers/test_conformance__textures__texture-active-bind.html]
 [_wrappers/test_conformance__textures__texture-complete.html]
 [_wrappers/test_conformance__textures__texture-formats-test.html]
 [_wrappers/test_conformance__textures__texture-mips.html]
 [_wrappers/test_conformance__textures__texture-npot-video.html]
 [_wrappers/test_conformance__textures__texture-npot.html]
 [_wrappers/test_conformance__textures__texture-size.html]
-skip-if = os == 'android'
 [_wrappers/test_conformance__textures__texture-size-cube-maps.html]
-skip-if = os == 'android'
 [_wrappers/test_conformance__textures__texture-transparent-pixels-initialized.html]
 [_wrappers/test_conformance__typedarrays__array-buffer-crash.html]
 [_wrappers/test_conformance__typedarrays__array-buffer-view-crash.html]
 [_wrappers/test_conformance__typedarrays__array-unit-tests.html]
 [_wrappers/test_conformance__uniforms__gl-uniform-arrays.html]
 [_wrappers/test_conformance__uniforms__gl-uniform-bool.html]
 [_wrappers/test_conformance__uniforms__gl-uniformmatrix4fv.html]
 [_wrappers/test_conformance__uniforms__gl-unknown-uniform.html]
deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/_wrappers/test_always-fail.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<html>
-<head>
-<title>
-Mochitest wrapper for WebGL Conformance Test Suite tests
-</title>
-<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-<link rel="stylesheet" type="text/css" href="../mochi-wrapper.css"/>
-</head>
-<body>
-<iframe src='../mochi-single.html?always-fail.html'>
-</iframe>
-</body>
-</html>
deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/always-fail.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-<meta charset="utf-8">
-    <title>Always fail test</title>
-    <link rel="stylesheet" href="resources/js-test-style.css"/>
-    <script src="resources/js-test-pre.js"></script>
-</head>
-<body>
-<canvas id="example" width="50" height="50">
-</canvas>
-<div id="description"></div>
-<div id="console"></div>
-
-<script>
-description("Deliberately fail so as to test our harness.");
-
-testFailed("The harness should expect and handle this failure.");
-
-finishTest();
-</script>
-
-</body>
-</html>
-
--- a/dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py
+++ b/dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py
@@ -215,122 +215,56 @@ def WriteWrappers(testFilePathList):
 
         wrapperFilePathList.append(wrapperFilePath)
         continue
 
     return wrapperFilePathList
 
 
 def WriteManifest(wrapperFilePathList, supportFilePathList):
-    errataMap = LoadErrata()
-
-    # DEFAULT_ERRATA
-    defaultHeader = '[DEFAULT]'
-    defaultErrataStr = ''
-    if defaultHeader in errataMap:
-        defaultErrataStr = '\n'.join(errataMap[defaultHeader])
-        del errataMap[defaultHeader]
-
-    # SUPPORT_FILES
-    supportFilePathList = sorted(supportFilePathList)
-    supportFilesStr = '\n'.join(supportFilePathList)
-
-    # MANIFEST_TESTS
-    headerList = ['[' + x + ']' for x in wrapperFilePathList]
+    manifestTestList = []
+    for cur in wrapperFilePathList:
+        manifestTestList.append('[' + cur + ']')
 
-    manifestTestLineList = []
-    for header in headerList:
-        manifestTestLineList.append(header)
-
-        if not header in errataMap:
-            continue
+    supportFilePathList = sorted(supportFilePathList)
 
-        errataLineList = errataMap[header]
-        del errataMap[header]
-        manifestTestLineList += errataLineList
-        continue
+    supportFilesStr = '\n'.join(supportFilePathList)
+    manifestTestsStr = '\n'.join(manifestTestList)
 
-    assert not errataMap, 'Errata left in map: {}'.format(str(errataMap))
-
-    manifestTestsStr = '\n'.join(manifestTestLineList)
-
-    # Fill the template.
     templateDict = {
-        'DEFAULT_ERRATA': defaultErrataStr,
         'SUPPORT_FILES': supportFilesStr,
         'MANIFEST_TESTS': manifestTestsStr,
     }
 
     FillTemplate(MANIFEST_TEMPLATE_FILEPATH, templateDict,
                  MANIFEST_OUTPUT_FILEPATH)
     return
 
 ##############################
 # Internals
 
 WRAPPER_TEMPLATE_FILEPATH = 'mochi-wrapper.html.template'
 WRAPPERS_DIR = '_wrappers'
 MANIFEST_TEMPLATE_FILEPATH = 'mochitest.ini.template'
 MANIFEST_OUTPUT_FILEPATH = '_mochitest.ini'
-ERRATA_FILEPATH = 'mochitest-errata.ini'
-kManifestHeaderRegex = re.compile(r'\[[^\]]*?\]')
-
-
-def LoadErrata():
-    nodeMap = {}
-
-    nodeHeader = None
-    nodeLineList = []
-    with open(ERRATA_FILEPATH, 'r') as f:
-        for line in f:
-            line = line.rstrip()
-            cur = line.lstrip()
-            if cur.startswith('#'):
-                continue
-
-            if not cur:
-                continue
-
-            if not cur.startswith('['):
-                nodeLineList.append(line)
-                continue
-
-            match = kManifestHeaderRegex.search(cur)
-            assert match, line
-
-            nodeHeader = match.group()
-            assert not nodeHeader in nodeMap, 'Duplicate header: ' + nodeHeader
-            nodeLineList = []
-            nodeMap[nodeHeader] = nodeLineList
-            continue
-
-    return nodeMap
 
 ########################################################################
 
 SUPPORT_DIRS = [
     'conformance',
     'resources',
 ]
 
-EXTRA_SUPPORT_FILES = [
-    'always-fail.html',
-]
-
-
 def GetSupportFileList():
     ret = []
     for supportDir in SUPPORT_DIRS:
         ret += GetFilePathListForDir(supportDir)
 
-    ret += EXTRA_SUPPORT_FILES
-
     return ret
 
-
 def GetFilePathListForDir(baseDir):
     ret = []
     for root, folders, files in os.walk(baseDir):
         for f in files:
             filePath = os.path.join(root, f)
             ret.append(filePath)
 
     return ret
--- a/dom/canvas/test/webgl-conformance/mochi-single.html
+++ b/dom/canvas/test/webgl-conformance/mochi-single.html
@@ -53,129 +53,21 @@ if (!window.todo) {
 if (!window.SimpleTest) {
   window.SimpleTest = {
     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;
-var OS_VERSION_OSX_10_6 = 10.6;
-var OS_VERSION_OSX_10_8 = 10.8;
-
-// ICS 4.0-4.0.2 was 14, 4.0.3+ was 15.
-var OS_VERSION_ANDROID_ICS = 14;
-
-var ALWAYS_FAIL_TEST_FILEPATH = 'always-fail.html';
-
-function GetExpectedTestFailSet() {
-  var failSet = {};
-
-  failSet[ALWAYS_FAIL_TEST_FILEPATH] = true;
-
-  switch (DriverInfo.getOS()) {
-    case DriverInfo.OS.WINDOWS:
-      if (DriverInfo.getOSVersion() >= OS_VERSION_WIN7) {
-        // Win7 and Win8 slaves.
-        failSet['conformance/textures/tex-image-and-sub-image-2d-with-video.html'] = true;
-        failSet['conformance/textures/texture-npot-video.html'] = true;
-      }
-      break;
-
-    case DriverInfo.OS.MAC:
-      if (DriverInfo.getOSVersion() == OS_VERSION_OSX_10_8) {
-        failSet['conformance/glsl/functions/glsl-function-smoothstep-gentype.html'] = true;
-        failSet['conformance/glsl/variables/gl-pointcoord.html'] = true;
-        failSet['conformance/limits/gl-max-texture-dimensions.html'] = true;
-        failSet['conformance/textures/texture-size.html'] = true;
-      } else if (DriverInfo.getOSVersion() == OS_VERSION_OSX_10_6) {
-        failSet['conformance/glsl/misc/glsl-function-nodes.html'] = true;
-      }
-      break;
-
-    case DriverInfo.OS.LINUX:
-      failSet['conformance/extensions/oes-texture-float.html'] = true;
-      failSet['conformance/glsl/functions/glsl-function-sin.html'] = true;
-      failSet['conformance/misc/type-conversion-test.html'] = true;
-      failSet['conformance/textures/texture-mips.html'] = true;
-      failSet['conformance/textures/texture-size-cube-maps.html'] = true;
-      break;
-
-    case DriverInfo.OS.ANDROID:
-      failSet['conformance/extensions/oes-texture-float.html'] = true;
-
-      if (DriverInfo.getOSVersion() >= OS_VERSION_ANDROID_ICS) {
-        // Android 4.0 slaves.
-        failSet['conformance/extensions/oes-vertex-array-object.html'] = true;
-        failSet['conformance/glsl/functions/glsl-function-abs.html'] = true;
-        failSet['conformance/glsl/functions/glsl-function-faceforward.html'] = true;
-        failSet['conformance/glsl/functions/glsl-function-sign.html'] = true;
-        failSet['conformance/glsl/functions/glsl-function-smoothstep-float.html'] = true;
-        failSet['conformance/glsl/functions/glsl-function-step-float.html'] = true;
-        failSet['conformance/glsl/functions/glsl-function-step-gentype.html'] = true;
-        failSet['conformance/limits/gl-max-texture-dimensions.html'] = true;
-        failSet['conformance/limits/gl-min-textures.html'] = true;
-        failSet['conformance/rendering/draw-elements-out-of-bounds.html'] = true;
-        failSet['conformance/state/gl-get-calls.html'] = true;
-        failSet['conformance/textures/tex-image-with-format-and-type.html'] = true;
-        failSet['conformance/textures/tex-sub-image-2d.html'] = true;
-        failSet['conformance/textures/texture-mips.html'] = true;
-        failSet['conformance/textures/texture-npot.html'] = true;
-        failSet['conformance/textures/texture-size-cube-maps.html'] = true;
-      } else {
-        // Android 2.3 slaves.
-        failSet['conformance/glsl/functions/glsl-function-sin.html'] = true;
-        failSet['conformance/misc/error-reporting.html'] = true;
-        failSet['conformance/misc/object-deletion-behaviour.html'] = true;
-        failSet['conformance/programs/get-active-test.html'] = true;
-        failSet['conformance/textures/tex-image-and-sub-image-2d-with-video.html'] = true;
-        failSet['conformance/textures/texture-mips.html'] = true;
-        failSet['conformance/textures/texture-npot.html'] = true;
-      }
-      break;
-
-    case DriverInfo.OS.B2G:
-      failSet['conformance/context/context-attributes-alpha-depth-stencil-antialias.html'] = true;
-      failSet['conformance/extensions/oes-texture-float.html'] = true;
-      failSet['conformance/glsl/functions/glsl-function-sin.html'] = true;
-      failSet['conformance/glsl/reserved/_webgl_function.vert.html'] = true;
-      failSet['conformance/glsl/reserved/webgl_function.vert.html'] = true;
-      failSet['conformance/misc/error-reporting.html'] = true;
-      failSet['conformance/misc/object-deletion-behaviour.html'] = true;
-      failSet['conformance/programs/get-active-test.html'] = true;
-      failSet['conformance/textures/tex-input-validation.html'] = true;
-      failSet['conformance/textures/texture-mips.html'] = true;
-      failSet['conformance/textures/texture-npot.html'] = true;
-      failSet['conformance/textures/texture-size-cube-maps.html'] = true;
-      failSet['conformance/textures/texture-size.html'] = true;
-      break;
-  }
-
-  return failSet;
-}
-
-////////////////////////////////////////////////////////////////////////
 // Test running and harness.
 
 var gTestPath = null;
 
 function RunTest(testPath) {
-  console.log('testPath: ' + testPath);
-
-  if (testPath == ALWAYS_FAIL_TEST_FILEPATH) {
-    // Make it easier to respond to new test failures.
-    console.log('OS: ' + DriverInfo.getOS());
-    console.log('OS version: ' + DriverInfo.getOSVersion());
-    console.log('Driver: ' + DriverInfo.getDriver());
-  }
-
   pathElem.innerHTML = testPath;
   gTestPath = testPath;
 
   // Auto-update to grow the size of the doc.
   function UpdateFrameSize() {
     var frameBody = frameElem.contentWindow.document.body;
 
     if (frameBody) {
@@ -218,25 +110,17 @@ window.webglTestHarness = {
     OnTestComplete();
   },
 };
 
 function OnTestComplete() {
   statusElem.innerHTML = 'Complete';
 
   var passed = failureCount == 0;
-
-  var passExpected = true;
-  if (gTestPath in GetExpectedTestFailSet())
-    passExpected = false;
-
-  var expectedStatus = passExpected ? 'pass' : 'fail';
-  var text = 'Should ' + expectedStatus + ': ' + gTestPath;
-
-  ok(passed == passExpected, text);
+  ok(passed, 'Should pass: ' + gTestPath);
   SimpleTest.finish();
 }
 
 ////////////////////////////////////////////////////////////////////////
 // Begin execution
 
 SimpleTest.waitForExplicitFinish();
 
@@ -248,14 +132,15 @@ do {
     ok(true, 'OS:' + DriverInfo.getOS());
     ok(true, 'OS version:' + DriverInfo.getOSVersion());
     ok(true, 'Driver:' + DriverInfo.getDriver());
 
     statusElem.innerHTML = 'Complete';
     break;
   }
 
-  RunTest(arg);
+  gTestPath = arg;
+  RunTest(gTestPath);
 } while (false);
 
 </script>
 </body>
 </html>
deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/mochitest-errata.ini
+++ /dev/null
@@ -1,72 +0,0 @@
-# See python/mozbuild/mozbuild/mozinfo.py for incoming data.
-
-[DEFAULT]
-# No e10s yet.
-# 'B2G Desktop Linux' fails to create WebGL contexts.
-skip-if = e10s || ((os == 'linux') && (buildapp == 'b2g'))
-
-########################################################################
-# All
-#[_wrappers/test_always-fail.html]
-#fail-if = 1
-# We'll be able to use `fail-if` after bug 987849.
-
-########################################################################
-# "tst-linux{32,64}-spot-NNN" Slaves:
-#   Android 2.3, B2G Emu, Linux, and Mulet.
-# Android: os == 'android'. (Not enough info to separate out 2.3)
-# B2G Emu: os == 'b2g'.
-# Linux: os == 'linux'.
-# Mulet: os == 'b2g' && buildapp == 'mulet'.
-[_wrappers/test_conformance__misc__invalid-passed-params.html]
-# Causes consistent *blues*: "DMError: Remote Device Error: unable to
-# connect to 127.0.0.1 after 5 attempts" on 'Android 2.3 Opt'.
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
-[_wrappers/test_conformance__reading__read-pixels-test.html]
-# Causes consistent *blues*: "DMError: Remote Device Error: unable to
-# connect to 127.0.0.1 after 5 attempts" on 'Android 2.3 Opt'.
-# Crashes near on B2G ICS Emulator.
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
-[_wrappers/test_conformance__textures__gl-teximage.html]
-# Crashes on Android 2.3.
-# Crashes near on B2G ICS Emulator.
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
-[_wrappers/test_conformance__misc__type-conversion-test.html]
-# Resets device on Android 2.3.
-# Crashes on B2G ICS Emulator, desktop Linux, and Mulet Linux x64.
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
-[_wrappers/test_conformance__textures__tex-image-and-sub-image-2d-with-video.html]
-# Random fail on Android 2.3.
-# Crashes on Mulet Linux x64 and B2G ICS Emulator.
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
-[_wrappers/test_conformance__textures__tex-image-with-format-and-type.html]
-# Crashes or blues on Android 2.3
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
-[_wrappers/test_conformance__textures__tex-input-validation.html]
-# Crashes on 'Android 2.3'
-# Asserts on 'B2G ICS Emulator Debug'.
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
-
-########################################################################
-# Android
-[_wrappers/test_conformance__misc__uninitialized-test.html]
-# Crashes on Android.
-skip-if = os == 'android'
-[_wrappers/test_conformance__renderbuffers__framebuffer-object-attachment.html]
-# Crashes on Android.
-skip-if = os == 'android'
-[_wrappers/test_conformance__textures__texture-size.html]
-# Crashes on Android 4.0.
-skip-if = os == 'android'
-[_wrappers/test_conformance__textures__texture-size-cube-maps.html]
-# Crashes on Android 4.0.
-skip-if = os == 'android'
-
-########################################################################
-# B2G
-[_wrappers/test_conformance__context__context-attributes-alpha-depth-stencil-antialias.html]
-# Asserts on 'B2G ICS Emulator Debug'.
-skip-if = (os == 'b2g')
-[_wrappers/test_conformance__textures__tex-image-and-uniform-binding-bugs.html]
-# Intermittently asserts on 'B2G ICS Emulator Debug'.
-skip-if = (os == 'b2g')
--- a/dom/canvas/test/webgl-conformance/mochitest.ini.template
+++ b/dom/canvas/test/webgl-conformance/mochitest.ini.template
@@ -1,8 +1,7 @@
 [DEFAULT]
-%%DEFAULT_ERRATA%%
-
+skip-if = e10s
 support-files = mochi-single.html
                 mochi-wrapper.css
                 %%SUPPORT_FILES%%
 
 %%MANIFEST_TESTS%%