Bug 1270672 - Re-enable the webgl conformance suite on e10s. r=jgilbert

dom/canvas/test/webgl-conf/generated-mochitest.ini

@@ -4,7 +4,7 @@
 
 [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
@@ -2524,7 +2524,7 @@ 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')
@@ -3151,7 +3151,7 @@ fail-if = (os == 'android' && (android_version == '10' || android_version == '18
 [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')

dom/canvas/test/webgl-conf/mochitest-errata.ini

@@ -108,9 +108,8 @@ 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')
@@ -211,8 +210,8 @@ skip-if = (os == 'android' && android_version == '10')
 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]