Bug 1277424 - Switch to 2.0 conformance suite and remove unnecessary tests
MozReview-Commit-ID: 2Ziyuzeiuaq
--- a/dom/canvas/test/webgl-conf/always-fail.html
+++ b/dom/canvas/test/webgl-conf/always-fail.html
@@ -1,14 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<meta charset='utf-8'>
<link rel='stylesheet' href='checkout/resources/js-test-style.css'/>
- <script src='checkout/resources/js-test-pre.js'></script>
+ <script src='checkout/js/js-test-pre.js'></script>
</head>
<body>
<div id='description'></div>
<div id='console'></div>
<script>
description('Deliberately fail so as to test our harness.');
--- a/dom/canvas/test/webgl-conf/checkout/00_test_list.txt
+++ b/dom/canvas/test/webgl-conf/checkout/00_test_list.txt
@@ -1,7 +1,8 @@
// files that end in .txt list other tests
// other lines are assumed to be .html files
conformance/00_test_list.txt
conformance/more/00_test_list.txt
-deqp/00_test_list.txt
+// Disable deqp tests temporarily
+// deqp/00_test_list.txt
--min-version 2.0.0 conformance2/00_test_list.txt
--- a/dom/canvas/test/webgl-conf/generate-wrappers-and-manifest.py
+++ b/dom/canvas/test/webgl-conf/generate-wrappers-and-manifest.py
@@ -4,30 +4,31 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# Write a Mochitest manifest for WebGL conformance test files.
import os
import re
-CURRENT_VERSION = '1.0.3'
+CURRENT_VERSION = '2.0.0'
# All paths in this file are based where this file is run.
WRAPPER_TEMPLATE_FILE = 'mochi-wrapper.html.template'
MANIFEST_TEMPLATE_FILE = 'mochitest.ini.template'
ERRATA_FILE = 'mochitest-errata.ini'
DEST_MANIFEST_PATHSTR = 'generated-mochitest.ini'
BASE_TEST_LIST_PATHSTR = 'checkout/00_test_list.txt'
GENERATED_PATHSTR = 'generated'
SUPPORT_DIRS = [
'checkout/conformance',
'checkout/resources',
+ 'checkout/js'
]
EXTRA_SUPPORT_FILES = [
'always-fail.html',
'iframe-passthrough.css',
'mochi-single.html',
]
--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -34,69 +34,49 @@ skip-if = os == 'b2g' || ((os == 'linux'
fail-if = 1
[generated/test_conformance__context__context-lost.html]
fail-if = 1
[generated/test_conformance__glsl__misc__shaders-with-invariance.html]
fail-if = 1
[generated/test_conformance__glsl__misc__shaders-with-name-conflicts.html]
[generated/test_conformance__renderbuffers__feedback-loop.html]
fail-if = 1
-[generated/test_conformance__textures__texture-copying-feedback-loops.html]
-fail-if = 1
####################
# Tests requesting non-local network connections.
[generated/test_conformance__more__functions__readPixelsBadArgs.html]
# (TODO) FATAL ERROR: Non-local network connections are disabled and a connection attempt to www.opengl.org (45.55.206.190) was made.
skip-if = 1
-[generated/test_conformance__textures__origin-clean-conformance.html]
-# (TODO) FATAL ERROR: Non-local network connections are disabled and a connection attempt to www.opengl.org (104.131.58.36) was made.
-skip-if = 1
-
[generated/test_conformance__more__functions__texImage2DHTML.html]
# (TODO) FATAL ERROR: Non-local network connections are disabled and a connection attempt to mashable.com (88.221.93.55) was made.
skip-if = 1
[generated/test_conformance__more__functions__texSubImage2DHTML.html]
# (TODO) FATAL ERROR: Non-local network connections are disabled and a connection attempt to mashable.com (184.50.232.90) was made.
skip-if = 1
####################
# Timing out
-[generated/test_conformance__textures__gl-teximage.html]
-skip-if = 1
-[generated/test_conformance__textures__texture-npot-video.html]
-skip-if = 1
-
-[generated/test_conformance__textures__texture-transparent-pixels-initialized.html]
-skip-if = 1
-[generated/test_conformance__textures__texture-upload-size.html]
-skip-if = 1
[generated/test_conformance__uniforms__uniform-default-values.html]
# Timeout on Windows, crash on Android/Linux.
skip-if = (os == 'android') || (os == 'linux') || (os == 'win')
[generated/test_conformance__ogles__GL__mat3__mat3_001_to_006.html]
# Timeout on D3D11
skip-if = (os == 'win' && os_version != '5.1')
########################################################################
# Complicated
[generated/test_conformance__context__context-attributes-alpha-depth-stencil-antialias.html]
fail-if = (os == 'mac' && os_version == '10.6')
# Asserts on 'B2G ICS Emulator Debug' and linux debug. Crashes on Android.
skip-if = (os == 'b2g') || (os == 'linux') || (os == 'android')
-[generated/test_conformance__extensions__webgl-draw-buffers.html]
-fail-if = (os == 'mac')
-# Crashes
-skip-if = (os == 'linux')
-
[generated/test_conformance__glsl__constructors__glsl-construct-bvec3.html]
# Crashes from libglsl.so
skip-if = (os == 'linux') || os == 'mac')
[generated/test_conformance__glsl__constructors__glsl-construct-bvec4.html]
# application crashed [@ ParseOperand::GetLogicalSize() const + 0x4]
skip-if = (os == 'linux') || os == 'mac')
[generated/test_conformance__glsl__constructors__glsl-construct-ivec3.html]
@@ -115,22 +95,16 @@ skip-if = ((os == 'linux') && asan)
fail-if = (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')
[generated/test_conformance__misc__object-deletion-behaviour.html]
fail-if = (os == 'android' && (android_version == '10' || android_version == '18')) || (os == 'b2g')
-[generated/test_conformance__textures__texture-npot.html]
-fail-if = (os == 'android' && (android_version == '10' || android_version == '18')) || (os == 'b2g')
-
-[generated/test_conformance__textures__texture-size.html]
-fail-if = (os == 'android') || (os == 'mac' && os_version == '10.8') || (os == 'b2g')
-
########################################################################
# "tst-linux{32,64}-spot-NNN" Slaves:
# Android 2.3, B2G Emu, Linux, and Mulet.
# Android: os == 'android'. (Not enough info to separate out 2.3)
# B2G Emu: os == 'b2g'.
# Linux: os == 'linux'.
# Mulet: os == 'b2g' && buildapp == 'mulet'.
[generated/test_conformance__glsl__bugs__temp-expressions-should-not-crash.html]
@@ -144,81 +118,35 @@ skip-if = (os == 'android') || (os == 'l
fail-if = (os == 'android') || (os == 'linux')
[generated/test_conformance__ogles__GL__sin__sin_001_to_006.html]
fail-if = (os == 'android') || (os == 'linux')
[generated/test_conformance__reading__read-pixels-test.html]
# Causes consistent *blues*: "DMError: Remote Device Error: unable to
# 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')
-[generated/test_conformance__textures__tex-input-validation.html]
-# Crashes on 'Android 2.3'
-# Asserts on 'B2G ICS Emulator Debug'.
-skip-if = (os == 'android') || (os == 'linux')
########################################################################
########################################################################
# Android
[generated/test_conformance__attribs__gl-disabled-vertex-attrib.html]
fail-if = (os == 'android')
-[generated/test_conformance__extensions__oes-texture-float.html]
-fail-if = (os == 'android')
[generated/test_conformance__extensions__oes-texture-float-linear.html]
fail-if = (os == 'android')
-[generated/test_conformance__extensions__oes-texture-float-with-canvas.html]
-fail-if = (os == 'android')
-[generated/test_conformance__extensions__oes-texture-float-with-image.html]
-fail-if = (os == 'android')
-[generated/test_conformance__extensions__oes-texture-float-with-image-data.html]
-fail-if = (os == 'android')
-[generated/test_conformance__extensions__oes-texture-float-with-video.html]
-fail-if = (os == 'android')
-[generated/test_conformance__extensions__oes-texture-half-float.html]
-fail-if = (os == 'android')
-[generated/test_conformance__extensions__oes-texture-half-float-linear.html]
-fail-if = (os == 'android')
-[generated/test_conformance__extensions__oes-texture-half-float-with-canvas.html]
-fail-if = (os == 'android')
-[generated/test_conformance__extensions__oes-texture-half-float-with-image.html]
-fail-if = (os == 'android')
-[generated/test_conformance__extensions__oes-texture-half-float-with-image-data.html]
-fail-if = (os == 'android')
-[generated/test_conformance__extensions__oes-texture-half-float-with-video.html]
-fail-if = (os == 'android')
-[generated/test_conformance__textures__texture-mips.html]
-fail-if = (os == 'android')
-[generated/test_conformance__textures__texture-size-cube-maps.html]
-fail-if = (os == 'android')
-[generated/test_conformance__textures__tex-image-and-sub-image-2d-with-video-rgb565.html]
-fail-if = (os == 'android')
-[generated/test_conformance__textures__tex-image-and-sub-image-2d-with-video-rgba4444.html]
-fail-if = (os == 'android')
-[generated/test_conformance__textures__tex-image-and-sub-image-2d-with-video-rgba5551.html]
-fail-if = (os == 'android')
-[generated/test_conformance__textures__tex-image-and-sub-image-2d-with-video.html]
-fail-if = (os == 'android')
-
-[generated/test_conformance__textures__texture-sub-image-cube-maps.html]
-fail-if = (os == 'android')
[generated/test_conformance__canvas__buffer-offscreen-test.html]
# Causes frequent *blues*: "DMError: Remote Device Error: unable to
# connect to 127.0.0.1 after 5 attempts" on 'Android 2.3 Opt'.
skip-if = (os == 'android' && android_version == '10')
[generated/test_conformance__canvas__rapid-resizing.html]
# Frequent orange crash.
skip-if = (os == 'android')
-[generated/test_conformance__textures__texture-size-limit.html]
-# 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]
# Crashes sometimes
skip-if = (os == 'android')
[generated/test_conformance__canvas__drawingbuffer-hd-dpi-test.html]
# Crashes
skip-if = (os == 'android')
[generated/test_conformance__context__context-creation.html]
@@ -240,19 +168,16 @@ skip-if = (os == 'android')
# Crashes
skip-if = (os == 'android')
[generated/test_conformance__glsl__variables__gl-fragcoord.html]
# Crashes
skip-if = (os == 'android')
[generated/test_conformance__rendering__many-draw-calls.html]
# Crashes
skip-if = (os == 'android')
-[generated/test_conformance__textures__tex-image-webgl.html]
-# Crashes
-skip-if = (os == 'android')
[generated/test_conformance__uniforms__out-of-bounds-uniform-array-access.html]
# Crashes
skip-if = (os == 'android') || (os == 'mac' && os_version == '10.6')
[generated/test_conformance__glsl__samplers__glsl-function-texture2dproj.html]
# Crashes
skip-if = (os == 'android')
[generated/test_conformance__rendering__framebuffer-switch.html]
# Crashes
@@ -324,33 +249,27 @@ skip-if = (os == 'android' && android_ve
# OOM crash
skip-if = (os == 'android')
[generated/test_conformance__attribs__gl-bindAttribLocation-matrix.html]
# OOM crash
skip-if = (os == 'android')
[generated/test_conformance__misc__uninitialized-test.html]
# Crashes
skip-if = (os == 'android')
-[generated/test_conformance__renderbuffers__framebuffer-object-attachment.html]
-# Crashes
-skip-if = (os == 'android')
####################
####################
# Crashes on android 2.3 slaves
[generated/test_conformance__glsl__bugs__compare-loop-index-to-uniform.html]
skip-if = (os == 'android' && android_version == '10')
########################################################################
########################################################################
# B2G
-[generated/test_conformance__textures__tex-image-and-uniform-binding-bugs.html]
-# Intermittently asserts on 'B2G ICS Emulator Debug'.
-skip-if = (os == 'b2g')
[generated/test_conformance__glsl__reserved___webgl_function.vert.html]
fail-if = (os == 'b2g')
[generated/test_conformance__glsl__reserved__webgl_function.vert.html]
fail-if = (os == 'b2g')
[generated/test_conformance__misc__error-reporting.html]
fail-if = (os == 'b2g')
[generated/test_conformance__programs__get-active-test.html]
fail-if = (os == 'b2g')
@@ -383,38 +302,30 @@ skip-if = (os == 'linux')
# mesa upgrade issues or task cluster issues- we just need it green; bug 1220658
skip-if = (os == 'linux')
[generated/test_conformance__ogles__GL__notEqual__notEqual_001_to_008.html]
# Crashes
skip-if = (os == 'linux')
[generated/test_conformance__ogles__GL__sign__sign_001_to_006.html]
# Crashes
skip-if = (os == 'linux')
-[generated/test_conformance__textures__tex-image-and-sub-image-2d-with-image-data.html]
-# Crashes
-skip-if = (os == 'linux')
########################################################################
########################################################################
# Mac
[generated/test_conformance__canvas__drawingbuffer-static-canvas-test.html]
# Intermittent crash on OSX.
skip-if = (os == 'mac')
[generated/test_conformance__canvas__viewport-unchanged-upon-resize.html]
# New OSX r7 machines and 10.10.5 is causing perma failure (bug 1216549)
skip-if = (os == 'mac')
[generated/test_conformance__rendering__multisample-corruption.html]
# application crashed [@ gldAttachDrawable + 0x9e0]. Also crash on Android.
skip-if = (os == 'mac') || (os == 'android')
-[generated/test_conformance__extensions__oes-vertex-array-object.html]
-# 10.6 crash:
-# PROCESS-CRASH | dom/canvas/test/webgl-conf/generated/test_conformance__extensions__oes-vertex-array-object.html | application crashed [@ gleRunVertexSubmitImmediate + 0xf24]
-skip-if = (os == 'mac' && os_version == '10.6')
-
####################
# 10.6
[generated/test_conformance__glsl__constructors__glsl-construct-mat3.html]
fail-if = (os == 'mac' && os_version == '10.6')
[generated/test_conformance__glsl__constructors__glsl-construct-mat4.html]
fail-if = (os == 'mac' && os_version == '10.6')
[generated/test_conformance__glsl__matrices__glsl-mat4-to-mat3.html]
fail-if = (os == 'mac' && os_version == '10.6')
@@ -437,14 +348,11 @@ fail-if = (os == 'mac' && os_version ==
fail-if = (os == 'mac' && os_version == '10.8')
########################################################################
########################################################################
# Win
[generated/test_conformance__glsl__misc__large-loop-compile.html]
fail-if = (os == 'win' && os_version == '5.1')
-[generated/test_conformance__textures__copy-tex-image-2d-formats.html]
-# Assert failure in DEBUG
-skip-if = (os == 'win' && os_version == '5.1')
[generated/test_conformance__uniforms__uniform-values-per-program.html]
# Crashes on D3D11 debug.
skip-if = (os == 'win' && os_version != '5.1')