Bug 847267 - Disable webgl conformance video test on windows 6+ that fail with DXVA on nvidia hardware. r=jgilbert

This commit is contained in:
Chris Pearce 2013-05-04 22:12:41 +12:00
parent 16011bf3ac
commit fde382cc89
3 changed files with 13 additions and 4 deletions

View File

@ -19,6 +19,7 @@ MOCHITEST_FILES = \
failing_tests_linux_nvidia.txt \
failing_tests_windows.txt \
skipped_tests_winxp.txt \
skipped_tests_win_vista.txt \
failing_tests_mac.txt \
failing_tests_mac_mtnlion.txt \
failing_tests_android.txt \

View File

@ -0,0 +1,2 @@
conformance/textures/tex-image-and-sub-image-2d-with-video.html
conformance/textures/texture-npot-video.html

View File

@ -499,10 +499,16 @@ function start() {
.split('\n');
}
if (kIsWindows && !kIsWindowsVistaOrHigher) {
testsToSkip = loadTextFileSynchronous('skipped_tests_winxp.txt')
.replace(/\r/g, '') // convert to unix line breaks
.split('\n');
if (kIsWindows) {
if (!kIsWindowsVistaOrHigher) {
testsToSkip = loadTextFileSynchronous('skipped_tests_winxp.txt')
.replace(/\r/g, '') // convert to unix line breaks
.split('\n');
} else {
testsToSkip = loadTextFileSynchronous('skipped_tests_win_vista.txt')
.replace(/\r/g, '') // convert to unix line breaks
.split('\n');
}
}
runTestSuite();