Bug 1052240 - Mark more tests.

This commit is contained in:
Jeff Gilbert 2014-08-29 17:38:39 -07:00
parent ba6539ecd7
commit 119b349026
2 changed files with 9 additions and 5 deletions

View File

@ -743,7 +743,7 @@ skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
[_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')
skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux') || (os == 'win')
[_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]

View File

@ -13,6 +13,14 @@ skip-if = e10s || os == 'b2g' || ((os == 'linux') && (buildapp == 'b2g'))
#fail-if = 1
# We'll be able to use `fail-if` after bug 987849.
########################################################################
# "tst-linux{32,64}-spot-NNN" Slaves and Windows
[_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.
# Intermittent crash on Windows.
skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux') || (os == 'win')
########################################################################
# "tst-linux{32,64}-spot-NNN" Slaves:
# Android 2.3, B2G Emu, Linux, and Mulet.
@ -37,10 +45,6 @@ skip-if = (os == 'android') || (os == 'b2g') || (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')
[_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')