Bug 1325995 - Update tests.

MozReview-Commit-ID: H0k6ypLCW4P

dom/canvas/test/webgl-conf/checkout/conformance/glsl/misc/00_test_list.txt

@@ -36,7 +36,7 @@ shader-with-clipvertex.vert.html
 --min-version 1.0.2 shader-with-conditional-scoping-negative.html
 shader-with-default-precision.frag.html
 shader-with-default-precision.vert.html
-shader-with-define-line-continuation.frag.html
+--max-version 1.9.9 shader-with-define-line-continuation.frag.html
 shader-with-dfdx-no-ext.frag.html
 shader-with-dfdx.frag.html
 --min-version 1.0.2 shader-with-do-loop.html

dom/canvas/test/webgl-conf/checkout/conformance/misc/invalid-passed-params.html

@@ -44,6 +44,7 @@ description("Test for invalid passed parameters");
 
 var wtu = WebGLTestUtils;
 var context = wtu.create3DContext();
+var contextVersion = wtu.getDefault3DContextVersion();
 
 debug("");
 debug("Test createShader()");
@@ -110,7 +111,7 @@ function generateShaderSource(opt_invalidIdentifierChar, opt_invalidCommentChar)
                           + "varying float " + validAttribName + ";\n"
                           + "void main() {\n"
                           + validAttribName  + " = " + validUniformName + ";\n"
-                          + "gl_Position = vec4(0.0, 0.0, 0.0, 1.0); }\n";
+                          + "gl_Position = vec4(0.0, 0.0, 0.0, 1.0); }\n"
                           + "//.+-/*%<>[](){}^|&~=!:;,?# " + invalidCommentString;
 }
 var vShader = context.createShader(context.VERTEX_SHADER);
@@ -143,6 +144,9 @@ shouldBe("context.getError()", "context.NO_ERROR");
 debug("");
 debug("Test shaderSource() with invalid characters");
 for (var i = 0; i < invalidSet.length; ++i) {
+  // Backslash as line-continuation is allowed in WebGL 2.0.
+  if (contextVersion > 1 && invalidSet[i] == '\\')
+    continue;
   var validShaderSource = generateShaderSource(undefined, invalidSet[i]);
   context.shaderSource(vShader, validShaderSource);
   shouldBe("context.getError()", "context.NO_ERROR");

dom/canvas/test/webgl-conf/generated-mochitest.ini

@@ -5102,8 +5102,6 @@ skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__misc__shader-with-default-precision.vert.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-[generated/test_2_conformance__glsl__misc__shader-with-define-line-continuation.frag.html]
-skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__misc__shader-with-dfdx-no-ext.frag.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__misc__shader-with-dfdx.frag.html]