diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /dom/webgpu/mochitest | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/webgpu/mochitest')
| -rw-r--r-- | dom/webgpu/mochitest/mochitest-no-pref.toml | 1 | ||||
| -rw-r--r-- | dom/webgpu/mochitest/mochitest.toml | 63 | ||||
| -rw-r--r-- | dom/webgpu/mochitest/test_compilation_message_pos.html | 58 |
3 files changed, 62 insertions, 60 deletions
diff --git a/dom/webgpu/mochitest/mochitest-no-pref.toml b/dom/webgpu/mochitest/mochitest-no-pref.toml index 511b840c0b..ef83071c66 100644 --- a/dom/webgpu/mochitest/mochitest-no-pref.toml +++ b/dom/webgpu/mochitest/mochitest-no-pref.toml @@ -1,6 +1,7 @@ [DEFAULT] subsuite = "webgpu" run-if = ["release_or_beta"] +skip-if = ["verify"] # `test-verify` jobs don't guarantee a GPU, so skip them. # Even if the pref were enabled, WebGPU is only available in secure contexts. # diff --git a/dom/webgpu/mochitest/mochitest.toml b/dom/webgpu/mochitest/mochitest.toml index f32d7a9a86..d83dca2808 100644 --- a/dom/webgpu/mochitest/mochitest.toml +++ b/dom/webgpu/mochitest/mochitest.toml @@ -1,6 +1,7 @@ [DEFAULT] subsuite = "webgpu" run-if = ["!release_or_beta"] +skip-if = ["verify"] # `test-verify` jobs don't guarantee a GPU, so skip them. prefs = [ "dom.webgpu.enabled=true", "dom.webgpu.workers.enabled=true", @@ -18,60 +19,26 @@ support-files = [ scheme = "https" ["test_basic_canvas.worker.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_buffer_mapping.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_buffer_mapping_invalid_device.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_command_buffer_creation.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] + +["test_compilation_message_pos.html"] ["test_context_configure.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_device_creation.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_device_lost.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_double_encoder_finish.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_enabled.html"] ["test_error_scope.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_insecure_context.html"] # This test checks that WebGPU is not available in insecure contexts. @@ -80,37 +47,13 @@ scheme = "http" ["test_navigator_gpu_not_replaceable.html"] ["test_queue_copyExternalImageToTexture.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_queue_write.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_queue_write_invalid_device.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_submit_compute_empty.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_submit_render_empty.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] ["test_submit_render_empty.worker.html"] -fail-if = [ - "os == 'linux' && os_version == '18.04'", - "os == 'mac'", -] diff --git a/dom/webgpu/mochitest/test_compilation_message_pos.html b/dom/webgpu/mochitest/test_compilation_message_pos.html new file mode 100644 index 0000000000..f582cac5c0 --- /dev/null +++ b/dom/webgpu/mochitest/test_compilation_message_pos.html @@ -0,0 +1,58 @@ +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8" /> + <script src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" href="/tests/SimpleTest/test.css" /> + </head> + <body> + <script> + ok( + SpecialPowers.getBoolPref("dom.webgpu.enabled"), + "Pref should be enabled." + ); + + async function testBody() { + const adapter = await navigator.gpu.requestAdapter(); + const device = await adapter.requestDevice(); + + device.pushErrorScope("validation"); + const shaderModule = device.createShaderModule({ + // `?` is invalid, and we want to see if the offset will be right with the kitten emoji + // before it. + code: "/*🐈🐈🐈🐈🐈🐈🐈*/?", + }); + + const error = await device.popErrorScope(); + ok(error, "expected error from invalid shader"); + is(error.message, "Shader module creation failed: Parsing error"); + + const compilationInfo = await shaderModule.getCompilationInfo(); + is(compilationInfo.messages.length, 1); + + const { length, lineNum, linePos, message, offset } = + compilationInfo.messages[0]; + is(length, 1); + is(lineNum, 1); + is(linePos, 19); + is( + message, + ` +Shader '' parsing error: expected global item ('struct', 'const', 'var', 'alias', ';', 'fn') or the end of the file, found '?' + ┌─ wgsl:1:12 + │ +1 │ /*🐈🐈🐈🐈🐈🐈🐈*/? + │ ^ expected global item ('struct', 'const', 'var', 'alias', ';', 'fn') or the end of the file + +` + ); + is(offset, 18); + } + + SimpleTest.waitForExplicitFinish(); + testBody() + .catch(e => ok(false, "Unhandled exception " + e)) + .finally(() => SimpleTest.finish()); + </script> + </body> +</html> |