Bug 1270672 - Re-enable the webgl conformance suite on e10s. r=jgilbert
authorRyan VanderMeulen <ryanvm@gmail.com>
Sat, 07 May 2016 00:52:00 -0400
changeset 296530 1b4b8969b3f6aae6c645f84ce45ccc20404bcaed
parent 296529 a7783f2b454880fe5ab29f164c14bb2a94fa730e
child 296531 e968a9db2350ca8da68270839e08977bcd98aa75
push id30241
push usercbook@mozilla.com
push dateMon, 09 May 2016 09:18:37 +0000
treeherdermozilla-central@748b70bcdbc9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1270672
milestone49.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 1270672 - Re-enable the webgl conformance suite on e10s. r=jgilbert
dom/canvas/test/webgl-conf/generated-mochitest.ini
dom/canvas/test/webgl-conf/mochitest-errata.ini
--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -1,15 +1,15 @@
 # This is a GENERATED FILE. Do not edit it directly.
 # Regenerated it by using `python generate-wrappers-and-manifest.py`.
 # Mark failing (fail-if) and crashing (skip-if) tests in mochitest-errata.ini.
 
 [DEFAULT]
 subsuite = webgl
-skip-if = e10s || (os == 'b2g') || (os == 'linux' && (buildapp == 'b2g' || buildapp == 'mulet'))
+skip-if = os == 'b2g' || ((os == 'linux') && (buildapp == 'mulet'))
 
 support-files = always-fail.html
                 checkout/conformance/00_readme.txt
                 checkout/conformance/00_test_list.txt
                 checkout/conformance/attribs/00_test_list.txt
                 checkout/conformance/attribs/gl-bindAttribLocation-aliasing.html
                 checkout/conformance/attribs/gl-bindAttribLocation-matrix.html
                 checkout/conformance/attribs/gl-disabled-vertex-attrib.html
@@ -2519,17 +2519,17 @@ skip-if = (os == 'linux') || os == 'mac'
 skip-if = (os == 'linux') || os == 'mac')
 [generated/test_conformance__glsl__constructors__glsl-construct-ivec2.html]
 skip-if = (os == 'linux')
 [generated/test_conformance__glsl__constructors__glsl-construct-ivec3.html]
 skip-if = (os == 'linux') || (os == 'mac')
 [generated/test_conformance__glsl__constructors__glsl-construct-ivec4.html]
 skip-if = (os == 'linux') || (os == 'mac')
 [generated/test_conformance__glsl__constructors__glsl-construct-mat2.html]
-skip-if = (os == 'linux')
+skip-if = ((os == 'linux') && asan)
 fail-if = (os == 'mac' && os_version == '10.6')
 [generated/test_conformance__glsl__constructors__glsl-construct-mat3.html]
 fail-if = (os == 'mac' && os_version == '10.6')
 [generated/test_conformance__glsl__constructors__glsl-construct-mat4.html]
 fail-if = (os == 'mac' && os_version == '10.6')
 [generated/test_conformance__glsl__constructors__glsl-construct-vec-mat-corner-cases.html]
 skip-if = (os == 'linux')
 [generated/test_conformance__glsl__constructors__glsl-construct-vec-mat-index.html]
@@ -3146,17 +3146,17 @@ fail-if = 1
 fail-if = (os == 'android')
 [generated/test_conformance__textures__texture-npot-video.html]
 skip-if = 1
 [generated/test_conformance__textures__texture-npot.html]
 fail-if = (os == 'android' && (android_version == '10' || android_version == '18')) || (os == 'b2g')
 [generated/test_conformance__textures__texture-size-cube-maps.html]
 fail-if = (os == 'android')
 [generated/test_conformance__textures__texture-size-limit.html]
-skip-if = (os == 'android')
+skip-if = (os == 'android') || (os == 'linux' && asan && e10s)
 fail-if = (os == 'linux')
 [generated/test_conformance__textures__texture-size.html]
 fail-if = (os == 'android') || (os == 'mac' && os_version == '10.8') || (os == 'b2g')
 [generated/test_conformance__textures__texture-sub-image-cube-maps.html]
 fail-if = (os == 'android')
 [generated/test_conformance__textures__texture-transparent-pixels-initialized.html]
 skip-if = 1
 [generated/test_conformance__textures__texture-upload-cube-maps.html]
--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -103,19 +103,18 @@ skip-if = (os == 'linux') || os == 'mac'
 # application crashed [@ ParseOperand::GetLogicalSize() const + 0x4]
 skip-if = (os == 'linux') || (os == 'mac')
 [generated/test_conformance__glsl__constructors__glsl-construct-ivec4.html]
 # Assume crashes like ivec3
 skip-if = (os == 'linux') || (os == 'mac')
 
 [generated/test_conformance__glsl__constructors__glsl-construct-mat2.html]
 fail-if = (os == 'mac' && os_version == '10.6')
-# Crashes on Linux ASAN:
-# SUMMARY: AddressSanitizer: SEGV ??:0 ??
-skip-if = (os == 'linux')
+# Crashes on Linux ASAN
+skip-if = ((os == 'linux') && asan)
 
 [generated/test_conformance__misc__type-conversion-test.html]
 fail-if = (os == 'linux')
 # 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')
 
 [generated/test_conformance__misc__object-deletion-behaviour.html]
@@ -206,18 +205,18 @@ fail-if = (os == 'android')
 # connect to 127.0.0.1 after 5 attempts" on 'Android 2.3 Opt'.
 skip-if = (os == 'android' && android_version == '10')
 
 [generated/test_conformance__canvas__rapid-resizing.html]
 # Frequent orange crash.
 skip-if = (os == 'android')
 
 [generated/test_conformance__textures__texture-size-limit.html]
-# Crashes and Blues.
-skip-if = (os == 'android')
+# Crashes, timeouts, and Blues.
+skip-if = (os == 'android') || (os == 'linux' && asan && e10s)
 fail-if = (os == 'linux')
 
 [generated/test_conformance__glsl__bugs__long-expressions-should-not-crash.html]
 # Crashes sometimes
 skip-if = (os == 'android')
 
 [generated/test_conformance__canvas__drawingbuffer-hd-dpi-test.html]
 # Crashes