tree 70052abe338c75207bd02fe74f9dccdf2e82a28a
parent 5eef2ef56e4d6524e0eee7a7fcd3a0dbb9bf30c0
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> 1643206263 +0000
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> 1643206263 +0000

WebGL conformance tests that are pending upstreaming should not duplicate unmodified files
https://bugs.webkit.org/show_bug.cgi?id=235631

Patch by Kimmo Kinnunen <kkinnunen@apple.com> on 2022-01-26
Reviewed by Antti Koivisto.

Duplicating the unmodified files keeps the pending tests somewhat isolated from the
upstream test updates. However, this is not feasible as the tests refer to bigger files
that are inconvenient to duplicate, such as videos. Also this makes it harder to write new tests,
since if the new pending test starts to use a file, the file would need duplication.
Also if the upstream has modified the shared files, the change done to the pending test needs
to be done anyway.

It is more consistent to use the same helper media, js and css resources for the pending tests
as the conformance test suite snapshot uses.

Remove all unmodified helper css and js files from the pending test directory and
use the unmodified files from the actual test files.

WebGL conformance tests are:
webgl/2.0.y/ -- autogenerated driver html files referencing the actual test suite test files
webgl/resources/webgl_test_files -- the actual test suite files

Move the pending tests similarly:
webgl/pending -- drivers
webgl/pending/resources/webgl_test_files -- old pending actual test files
webgl/resources/pending_webgl_test_files -- new pending actual test files

This way it is easier to refer to the resources from the actual test files.

* webgl/pending/conformance/context/context-attributes-alpha-depth-stencil-antialias-expected.txt:
* webgl/pending/conformance/context/context-attributes-alpha-depth-stencil-antialias.html:
* webgl/pending/conformance/glsl/misc/shader-with-reserved-words-2-expected.txt:
* webgl/pending/conformance/glsl/misc/shader-with-reserved-words-2.html:
* webgl/pending/conformance/glsl/misc/swizzle-as-lvalue-expected.txt:
* webgl/pending/conformance/glsl/misc/swizzle-as-lvalue.html:
* webgl/pending/conformance/textures/misc/tex-image-video-repeated-expected.txt:
* webgl/pending/conformance/textures/misc/tex-image-video-repeated.html:
* webgl/pending/conformance2/glsl3/empty-shader-with-output-expected.txt:
* webgl/pending/conformance2/glsl3/empty-shader-with-output.html:
* webgl/pending/conformance2/glsl3/float-constant-expressions-expected.txt:
* webgl/pending/conformance2/glsl3/float-constant-expressions.html:
* webgl/pending/resources/js-test-pre.js: Removed.
* webgl/pending/resources/webgl_test_files/js/glsl-conformance-test.js: Removed.
* webgl/pending/resources/webgl_test_files/js/js-test-post.js: Removed.
* webgl/pending/resources/webgl_test_files/js/js-test-pre.js: Removed.
* webgl/pending/resources/webgl_test_files/js/webgl-test-utils.js: Removed.
* webgl/pending/resources/webgl_test_files/resources/glsl-feature-tests.css: Removed.
* webgl/pending/resources/webgl_test_files/resources/js-test-style.css: Removed.
* webgl/pending/resources/webkit-webgl-test-harness.js: Removed.
* webgl/resources/pending_webgl_test_files/conformance/context/context-attributes-alpha-depth-stencil-antialias.html: Renamed from LayoutTests/webgl/pending/resources/webgl_test_files/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.
* webgl/resources/pending_webgl_test_files/conformance/glsl/misc/shader-with-reserved-words-2.html: Renamed from LayoutTests/webgl/pending/resources/webgl_test_files/conformance/glsl/misc/shader-with-reserved-words-2.html.
* webgl/resources/pending_webgl_test_files/conformance/glsl/misc/swizzle-as-lvalue.html: Renamed from LayoutTests/webgl/pending/resources/webgl_test_files/conformance/glsl/misc/swizzle-as-lvalue.html.
* webgl/resources/pending_webgl_test_files/conformance/textures/misc/tex-image-video-repeated.html: Renamed from LayoutTests/webgl/pending/resources/webgl_test_files/conformance/textures/misc/tex-image-video-repeated.html.
* webgl/resources/pending_webgl_test_files/conformance2/glsl3/empty-shader-with-output.html: Renamed from LayoutTests/webgl/pending/resources/webgl_test_files/conformance2/glsl3/empty-shader-with-output.html.
* webgl/resources/pending_webgl_test_files/conformance2/glsl3/float-constant-expressions.html: Renamed from LayoutTests/webgl/pending/resources/webgl_test_files/conformance2/glsl3/float-constant-expressions.html.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@288615 268f45cc-cd09-0410-ab3c-d52691b4dbfc