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

This commit is contained in:
Ryan VanderMeulen 2016-05-07 00:52:00 -04:00
Родитель ea473279ae
Коммит 1fa3a59f0a
2 изменённых файлов: 7 добавлений и 8 удалений

Просмотреть файл

@ -4,7 +4,7 @@
[DEFAULT] [DEFAULT]
subsuite = webgl 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 support-files = always-fail.html
checkout/conformance/00_readme.txt checkout/conformance/00_readme.txt
@ -2524,7 +2524,7 @@ skip-if = (os == 'linux') || (os == 'mac')
[generated/test_conformance__glsl__constructors__glsl-construct-ivec4.html] [generated/test_conformance__glsl__constructors__glsl-construct-ivec4.html]
skip-if = (os == 'linux') || (os == 'mac') skip-if = (os == 'linux') || (os == 'mac')
[generated/test_conformance__glsl__constructors__glsl-construct-mat2.html] [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') fail-if = (os == 'mac' && os_version == '10.6')
[generated/test_conformance__glsl__constructors__glsl-construct-mat3.html] [generated/test_conformance__glsl__constructors__glsl-construct-mat3.html]
fail-if = (os == 'mac' && os_version == '10.6') 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] [generated/test_conformance__textures__texture-size-cube-maps.html]
fail-if = (os == 'android') fail-if = (os == 'android')
[generated/test_conformance__textures__texture-size-limit.html] [generated/test_conformance__textures__texture-size-limit.html]
skip-if = (os == 'android') skip-if = (os == 'android') || (os == 'linux' && asan && e10s)
fail-if = (os == 'linux') fail-if = (os == 'linux')
[generated/test_conformance__textures__texture-size.html] [generated/test_conformance__textures__texture-size.html]
fail-if = (os == 'android') || (os == 'mac' && os_version == '10.8') || (os == 'b2g') fail-if = (os == 'android') || (os == 'mac' && os_version == '10.8') || (os == 'b2g')

Просмотреть файл

@ -108,9 +108,8 @@ skip-if = (os == 'linux') || (os == 'mac')
[generated/test_conformance__glsl__constructors__glsl-construct-mat2.html] [generated/test_conformance__glsl__constructors__glsl-construct-mat2.html]
fail-if = (os == 'mac' && os_version == '10.6') fail-if = (os == 'mac' && os_version == '10.6')
# Crashes on Linux ASAN: # Crashes on Linux ASAN
# SUMMARY: AddressSanitizer: SEGV ??:0 ?? skip-if = ((os == 'linux') && asan)
skip-if = (os == 'linux')
[generated/test_conformance__misc__type-conversion-test.html] [generated/test_conformance__misc__type-conversion-test.html]
fail-if = (os == 'linux') fail-if = (os == 'linux')
@ -211,8 +210,8 @@ skip-if = (os == 'android' && android_version == '10')
skip-if = (os == 'android') skip-if = (os == 'android')
[generated/test_conformance__textures__texture-size-limit.html] [generated/test_conformance__textures__texture-size-limit.html]
# Crashes and Blues. # Crashes, timeouts, and Blues.
skip-if = (os == 'android') skip-if = (os == 'android') || (os == 'linux' && asan && e10s)
fail-if = (os == 'linux') fail-if = (os == 'linux')
[generated/test_conformance__glsl__bugs__long-expressions-should-not-crash.html] [generated/test_conformance__glsl__bugs__long-expressions-should-not-crash.html]