mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Auto merge of #23876 - jdm:long-webgl, r=asajeffrey
Make another webgl test have a longer timeout. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23876) <!-- Reviewable:end -->
This commit is contained in:
commit
447ae1eae6
3 changed files with 17 additions and 2 deletions
|
@ -12424,7 +12424,9 @@
|
|||
"conformance/glsl/misc/shader-with-reserved-words.html": [
|
||||
[
|
||||
"conformance/glsl/misc/shader-with-reserved-words.html",
|
||||
{}
|
||||
{
|
||||
"timeout": "long"
|
||||
}
|
||||
]
|
||||
],
|
||||
"conformance/glsl/misc/shader-with-short-circuiting-operators.html": [
|
||||
|
@ -29157,7 +29159,7 @@
|
|||
"testharness"
|
||||
],
|
||||
"conformance/glsl/misc/shader-with-reserved-words.html": [
|
||||
"a2166e9df78cfd2b47489fcb1b8c082b920dec80",
|
||||
"fb9067f6c208c5763acc2e08add72243f5fbbbc8",
|
||||
"testharness"
|
||||
],
|
||||
"conformance/glsl/misc/shader-with-short-circuiting-operators.html": [
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="timeout" content="long">
|
||||
<title>WebGL GLSL Conformance Tests - Reserved Words</title>
|
||||
<link rel="stylesheet" href="../../../resources/js-test-style.css"/>
|
||||
<link rel="stylesheet" href="../../../resources/glsl-feature-tests.css"/>
|
||||
|
|
|
@ -1796,3 +1796,15 @@ index b88ba393ff..29476159ce 100644
|
|||
<title>WebGL GLSL conformance test: vec3_001_to_008.html</title>
|
||||
<link rel="stylesheet" href="../../../../resources/js-test-style.css" />
|
||||
<link rel="stylesheet" href="../../../../resources/ogles-tests.css" />
|
||||
diff --git a/conformance/glsl/misc/shader-with-reserved-words.html b/conformance/glsl/misc/shader-with-reserved-words.html
|
||||
index a2166e9df7..fb9067f6c2 100644
|
||||
--- a/conformance/glsl/misc/shader-with-reserved-words.html
|
||||
+++ b/conformance/glsl/misc/shader-with-reserved-words.html
|
||||
@@ -29,6 +29,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
+<meta name="timeout" content="long">
|
||||
<title>WebGL GLSL Conformance Tests - Reserved Words</title>
|
||||
<link rel="stylesheet" href="../../../resources/js-test-style.css"/>
|
||||
<link rel="stylesheet" href="../../../resources/glsl-feature-tests.css"/>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue