mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge m-c to fx-team a=merge CLOSED TREE

This commit is contained in:
Wes Kocher 2016-07-18 15:51:14 -07:00
Родитель 93020fda4e 65bed54efc
Коммит f64561db85
2 изменённых файлов: 1 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
dom/canvas/test/webgl-conf/generated-mochitest.ini
Просмотреть файл

@ -4488,7 +4488,6 @@ skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
[generated/test_2_conformance2__extensions__ext-color-buffer-float.html]
skip-if = (os == 'mac' && debug) || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
fail-if = (os == 'mac')
[generated/test_2_conformance2__extensions__promoted-extensions-in-shaders.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
[generated/test_2_conformance2__extensions__promoted-extensions.html]
@ -4561,7 +4560,6 @@ skip-if = (os == 'win') || (os == 'android' || os == 'linux' || (os == 'win' &&
[generated/test_2_conformance2__reading__read-pixels-from-fbo-test.html]
skip-if = (os == 'mac') || (os == 'win') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
[generated/test_2_conformance2__reading__read-pixels-into-pixel-pack-buffer.html]
fail-if = (os == 'mac') || (os == 'win')
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
[generated/test_2_conformance2__reading__read-pixels-pack-parameters.html]
fail-if = (os == 'mac') || (os == 'win')
@ -4608,10 +4606,8 @@ skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.
fail-if = (os == 'mac') || (os == 'win')
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
[generated/test_2_conformance__attribs__gl-bindAttribLocation-aliasing.html]
fail-if = (os == 'win')
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
[generated/test_2_conformance__attribs__gl-bindAttribLocation-matrix.html]
fail-if = (os == 'win')
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
[generated/test_2_conformance__attribs__gl-bindAttribLocation-repeated.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
@ -5746,10 +5742,8 @@ skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.
[generated/test_2_conformance__reading__read-pixels-pack-alignment.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
[generated/test_2_conformance__reading__read-pixels-test.html]
fail-if = (os == 'mac') || (os == 'win')
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
[generated/test_2_conformance__renderbuffers__feedback-loop.html]
fail-if = (os == 'mac') || (os == 'win')
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
[generated/test_2_conformance__renderbuffers__framebuffer-state-restoration.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
@ -6668,7 +6662,6 @@ fail-if = (os == 'android' && android_version == '10')
[generated/test_conformance__reading__read-pixels-pack-alignment.html]
[generated/test_conformance__reading__read-pixels-test.html]
skip-if = (os == 'android') || (os == 'linux')
fail-if = (os == 'mac') || (os == 'win')
[generated/test_conformance__renderbuffers__feedback-loop.html]
[generated/test_conformance__renderbuffers__framebuffer-object-attachment.html]
skip-if = (os == 'android')

14
dom/canvas/test/webgl-conf/mochitest-errata.ini
Просмотреть файл

@ -141,8 +141,6 @@ fail-if = (os == 'mac') || (os == 'win')
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance__textures__misc__tex-image-with-invalid-data.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance2__reading__read-pixels-into-pixel-pack-buffer.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance2__samplers__sampler-drawing-test.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance2__buffers__buffer-type-restrictions.html]
@ -155,8 +153,6 @@ fail-if = (os == 'mac') || (os == 'win')
fail-if = (os == 'mac')
[generated/test_2_conformance__attribs__gl-vertexattribpointer.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance__reading__read-pixels-test.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance2__buffers__buffer-copying-restrictions.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance2__glsl3__forbidden-operators.html]
@ -171,8 +167,6 @@ fail-if = (os == 'mac') || (os == 'win')
fail-if = (os == 'mac') || (os == 'win')
[generated/test_conformance__extensions__oes-texture-half-float.html]
fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux')
[generated/test_2_conformance__renderbuffers__feedback-loop.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance2__buffers__buffer-copying-contents.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance2__reading__read-pixels-pack-parameters.html]
@ -249,7 +243,6 @@ fail-if = (os == 'android') || (os == 'linux')
# connect to 127.0.0.1 after 5 attempts" on 'Android 2.3 Opt'.
# Crashes near on B2G ICS Emulator.
skip-if = (os == 'android') || (os == 'linux')
fail-if = (os == 'mac') || (os == 'win')
[generated/test_conformance__textures__misc__texture-upload-size.html]
# application crashed [@ mozilla::WebGLTexture::TexSubImage]
skip-if = (os == 'win') || (os == 'android')
@ -579,7 +572,6 @@ fail-if = (os == 'mac')
fail-if = (os == 'mac')
[generated/test_2_conformance2__extensions__ext-color-buffer-float.html]
fail-if = (os == 'mac')
skip-if = (os == 'mac' && debug)
[generated/test_2_conformance__limits__gl-line-width.html]
skip-if = (os == 'mac')
@ -696,9 +688,5 @@ skip-if = (os == 'win' && os_version == '6.1')
fail-if = (os == 'win' && os_version != '5.1')
[generated/test_2_conformance__canvas__rapid-resizing.html]
fail-if = (os == 'win')
[generated/test_2_conformance__attribs__gl-bindAttribLocation-aliasing.html]
fail-if = (os == 'win')
[generated/test_2_conformance__attribs__gl-bindAttribLocation-matrix.html]
fail-if = (os == 'win')
[generated/test_conformance__glsl__bugs__floor-div-cos-should-not-truncate.html]
fail-if = (os == 'win' && os_version == '5.1')
fail-if = (os == 'win' && os_version == '5.1')