From 02700ab162e22877024c2be481fa774a2b8b5b69 Mon Sep 17 00:00:00 2001 From: Kevin Reid Date: Mon, 31 Mar 2025 18:17:05 -0700 Subject: [PATCH] Move test and benchmark targets to standard Cargo autodiscovery layout. (#7436) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will make it easier for contributors to understand the file layout, at the cost of said layout containing several more nested directories. I will personally appreciate not having to remember to look for `root.rs` instead of `main.rs`. I also renamed the test targets so that they do not *all* share the superfluous suffix “-test” (test targets live in a different namespace than other target types and packages, so the name can presume that it is always known that they are tests). The Naga snapshot data sets `naga/tests/{in,out}` have been left in their original positions. --- benches/Cargo.toml | 2 - .../{ => wgpu-benchmark}/bind_groups.rs | 0 .../computepass-bindless.wgsl | 0 .../{ => wgpu-benchmark}/computepass.rs | 0 .../{ => wgpu-benchmark}/computepass.wgsl | 0 .../{root.rs => wgpu-benchmark/main.rs} | 0 .../renderpass-bindless.wgsl | 0 .../{ => wgpu-benchmark}/renderpass.rs | 0 .../{ => wgpu-benchmark}/renderpass.wgsl | 0 .../{ => wgpu-benchmark}/resource_creation.rs | 0 .../benches/{ => wgpu-benchmark}/shader.rs | 1 + docs/testing.md | 48 +++++++++--------- naga/.gitattributes | 2 +- naga/Cargo.toml | 5 -- naga/tests/{ => naga}/example_wgsl.rs | 0 naga/tests/{root.rs => naga/main.rs} | 0 naga/tests/{ => naga}/snapshots.rs | 0 naga/tests/{ => naga}/spirv_capabilities.rs | 0 naga/tests/{ => naga}/validation.rs | 0 naga/tests/{ => naga}/wgsl_errors.rs | 0 player/Cargo.toml | 7 --- player/tests/{ => player}/data/all.ron | 0 player/tests/{ => player}/data/bind-group.ron | 0 .../tests/{ => player}/data/buffer-copy.ron | 0 .../data/clear-buffer-texture.ron | 0 .../tests/{ => player}/data/clear-texture.bin | Bin player/tests/{ => player}/data/data1.bin | Bin player/tests/{ => player}/data/empty.wgsl | 0 .../data/pipeline-statistics-query.ron | 0 player/tests/{ => player}/data/quad.bin | 0 player/tests/{ => player}/data/quad.ron | 0 player/tests/{ => player}/data/quad.wgsl | 0 player/tests/{ => player}/data/zero-16k.bin | Bin .../data/zero-init-buffer-for-binding.wgsl | 0 .../{ => player}/data/zero-init-buffer.ron | 0 .../data/zero-init-texture-binding.ron | 0 .../data/zero-init-texture-binding.wgsl | 0 .../data/zero-init-texture-copytobuffer.ron | 0 .../data/zero-init-texture-rendertarget.ron | 0 player/tests/{root.rs => player/main.rs} | 2 +- tests/Cargo.toml | 13 ++--- .../wgpu-compile}/fail/cpass_lifetime.rs | 0 .../wgpu-compile}/fail/cpass_lifetime.stderr | 0 .../wgpu-compile}/fail/rpass_lifetime.rs | 0 .../wgpu-compile}/fail/rpass_lifetime.stderr | 0 .../root.rs => tests/wgpu-compile/main.rs} | 0 .../root.rs => tests/wgpu-dependency/main.rs} | 0 .../wgpu-gpu}/3x3_colors.png | Bin .../wgpu-gpu}/bgra8unorm_storage.rs | 0 .../wgpu-gpu}/bind_group_layout_dedup.rs | 0 .../wgpu-gpu}/bind_groups.rs | 0 .../wgpu-gpu}/binding_array/buffers.rs | 0 .../wgpu-gpu}/binding_array/mod.rs | 0 .../binding_array/sampled_textures.rs | 0 .../wgpu-gpu}/binding_array/samplers.rs | 0 .../binding_array/storage_textures.rs | 0 tests/{gpu-tests => tests/wgpu-gpu}/buffer.rs | 0 .../wgpu-gpu}/buffer_copy.rs | 0 .../wgpu-gpu}/buffer_usages.rs | 0 .../wgpu-gpu}/clear_texture.rs | 0 .../wgpu-gpu}/cloneable_types.rs | 0 .../wgpu-gpu}/compute_pass_ownership.rs | 0 .../wgpu-gpu}/create_surface_error.rs | 0 tests/{gpu-tests => tests/wgpu-gpu}/device.rs | 0 .../wgpu-gpu}/dispatch_workgroups_indirect.rs | 0 .../wgpu-gpu}/draw_indirect.rs | 0 .../wgpu-gpu}/dual_source_blending.rs | 0 .../{gpu-tests => tests/wgpu-gpu}/encoder.rs | 0 .../wgpu-gpu}/external_texture.rs | 0 .../wgpu-gpu}/float32_filterable.rs | 0 .../image_atomics/image_32_atomics.wgsl | 0 .../image_atomics/image_64_atomics.wgsl | 0 .../wgpu-gpu}/image_atomics/mod.rs | 0 .../{gpu-tests => tests/wgpu-gpu}/instance.rs | 0 .../wgpu-gpu}/life_cycle.rs | 0 .../root.rs => tests/wgpu-gpu/main.rs} | 0 .../wgpu-gpu}/mem_leaks.rs | 0 .../wgpu-gpu}/nv12_texture/mod.rs | 0 .../wgpu-gpu}/nv12_texture/nv12_texture.wgsl | 0 .../wgpu-gpu}/occlusion_query/mod.rs | 0 .../wgpu-gpu}/occlusion_query/shader.wgsl | 0 .../wgpu-gpu}/oob_indexing.rs | 0 .../{gpu-tests => tests/wgpu-gpu}/pipeline.rs | 0 .../wgpu-gpu}/pipeline_cache.rs | 0 tests/{gpu-tests => tests/wgpu-gpu}/poll.rs | 0 .../wgpu-gpu}/push_constants.rs | 0 .../wgpu-gpu}/query_set.rs | 0 .../wgpu-gpu}/queue_transfer.rs | 0 .../wgpu-gpu}/ray_tracing/as_build.rs | 0 .../wgpu-gpu}/ray_tracing/as_create.rs | 0 .../ray_tracing/as_use_after_free.rs | 0 .../wgpu-gpu}/ray_tracing/mod.rs | 0 .../wgpu-gpu}/ray_tracing/scene/mesh_gen.rs | 0 .../wgpu-gpu}/ray_tracing/scene/mod.rs | 0 .../wgpu-gpu}/ray_tracing/shader.rs | 0 .../wgpu-gpu}/ray_tracing/shader.wgsl | 0 .../wgpu-gpu}/regression/issue_3349.fs.wgsl | 0 .../wgpu-gpu}/regression/issue_3349.rs | 0 .../wgpu-gpu}/regression/issue_3349.vs.wgsl | 0 .../wgpu-gpu}/regression/issue_3457.rs | 0 .../wgpu-gpu}/regression/issue_3457.wgsl | 0 .../wgpu-gpu}/regression/issue_4024.rs | 0 .../wgpu-gpu}/regression/issue_4122.rs | 0 .../wgpu-gpu}/regression/issue_4485.rs | 0 .../wgpu-gpu}/regression/issue_4485.wgsl | 0 .../wgpu-gpu}/regression/issue_4514.rs | 0 .../wgpu-gpu}/regression/issue_4514.wgsl | 0 .../wgpu-gpu}/regression/issue_5553.rs | 0 .../wgpu-gpu}/regression/issue_5553.wgsl | 0 .../wgpu-gpu}/regression/issue_6317.rs | 0 .../wgpu-gpu}/regression/issue_6467.rs | 0 .../wgpu-gpu}/regression/issue_6827.rs | 0 .../wgpu-gpu}/render_pass_ownership.rs | 0 .../wgpu-gpu}/resource_descriptor_accessor.rs | 0 .../wgpu-gpu}/resource_error.rs | 0 .../{gpu-tests => tests/wgpu-gpu}/samplers.rs | 0 .../wgpu-gpu}/scissor_tests/mod.rs | 0 .../wgpu-gpu}/scissor_tests/solid_white.wgsl | 0 .../wgpu-gpu}/shader/array_size_overrides.rs | 0 .../compilation_messages/error_shader.wgsl | 0 .../shader/compilation_messages/mod.rs | 0 .../successful_shader.wgsl | 0 .../wgpu-gpu}/shader/data_builtins.rs | 0 .../wgpu-gpu}/shader/mod.rs | 0 .../wgpu-gpu}/shader/numeric_builtins.rs | 0 .../wgpu-gpu}/shader/shader_test.wgsl | 0 .../wgpu-gpu}/shader/struct_layout.rs | 0 .../shader/workgroup_size_overrides.rs | 0 .../shader/zero_init_workgroup_mem.rs | 0 .../shader/zero_init_workgroup_mem.wgsl | 0 .../wgpu-gpu}/shader_primitive_index/mod.rs | 0 .../primitive_index.wgsl | 0 .../wgpu-gpu}/shader_view_format/mod.rs | 0 .../shader_view_format/view_format.wgsl | 0 .../wgpu-gpu}/subgroup_operations/mod.rs | 0 .../wgpu-gpu}/subgroup_operations/shader.wgsl | 0 .../wgpu-gpu}/texture_binding/mod.rs | 0 .../wgpu-gpu}/texture_binding/shader.wgsl | 0 .../texture_binding/single_scalar.wgsl | 0 .../wgpu-gpu}/texture_blit.rs | 0 .../wgpu-gpu}/texture_bounds.rs | 0 .../wgpu-gpu}/texture_view_creation.rs | 0 .../{gpu-tests => tests/wgpu-gpu}/transfer.rs | 0 .../wgpu-gpu}/transition_resources.rs | 0 .../wgpu-gpu}/vertex_formats/draw.vert.wgsl | 0 .../wgpu-gpu}/vertex_formats/mod.rs | 0 .../wgpu-gpu}/vertex_indices/draw.vert.wgsl | 0 .../wgpu-gpu}/vertex_indices/mod.rs | 0 .../wgpu-gpu}/write_texture.rs | 0 .../zero_init_texture_after_discard.rs | 0 .../wgpu-validation}/api/binding_arrays.rs | 0 .../wgpu-validation}/api/buffer.rs | 0 .../wgpu-validation}/api/buffer_slice.rs | 0 .../wgpu-validation}/api/instance.rs | 0 .../wgpu-validation}/api/mod.rs | 0 .../wgpu-validation}/api/texture.rs | 0 .../root.rs => tests/wgpu-validation/main.rs} | 0 .../wgpu-validation}/noop.rs | 0 158 files changed, 31 insertions(+), 49 deletions(-) rename benches/benches/{ => wgpu-benchmark}/bind_groups.rs (100%) rename benches/benches/{ => wgpu-benchmark}/computepass-bindless.wgsl (100%) rename benches/benches/{ => wgpu-benchmark}/computepass.rs (100%) rename benches/benches/{ => wgpu-benchmark}/computepass.wgsl (100%) rename benches/benches/{root.rs => wgpu-benchmark/main.rs} (100%) rename benches/benches/{ => wgpu-benchmark}/renderpass-bindless.wgsl (100%) rename benches/benches/{ => wgpu-benchmark}/renderpass.rs (100%) rename benches/benches/{ => wgpu-benchmark}/renderpass.wgsl (100%) rename benches/benches/{ => wgpu-benchmark}/resource_creation.rs (100%) rename benches/benches/{ => wgpu-benchmark}/shader.rs (99%) rename naga/tests/{ => naga}/example_wgsl.rs (100%) rename naga/tests/{root.rs => naga/main.rs} (100%) rename naga/tests/{ => naga}/snapshots.rs (100%) rename naga/tests/{ => naga}/spirv_capabilities.rs (100%) rename naga/tests/{ => naga}/validation.rs (100%) rename naga/tests/{ => naga}/wgsl_errors.rs (100%) rename player/tests/{ => player}/data/all.ron (100%) rename player/tests/{ => player}/data/bind-group.ron (100%) rename player/tests/{ => player}/data/buffer-copy.ron (100%) rename player/tests/{ => player}/data/clear-buffer-texture.ron (100%) rename player/tests/{ => player}/data/clear-texture.bin (100%) rename player/tests/{ => player}/data/data1.bin (100%) rename player/tests/{ => player}/data/empty.wgsl (100%) rename player/tests/{ => player}/data/pipeline-statistics-query.ron (100%) rename player/tests/{ => player}/data/quad.bin (100%) rename player/tests/{ => player}/data/quad.ron (100%) rename player/tests/{ => player}/data/quad.wgsl (100%) rename player/tests/{ => player}/data/zero-16k.bin (100%) rename player/tests/{ => player}/data/zero-init-buffer-for-binding.wgsl (100%) rename player/tests/{ => player}/data/zero-init-buffer.ron (100%) rename player/tests/{ => player}/data/zero-init-texture-binding.ron (100%) rename player/tests/{ => player}/data/zero-init-texture-binding.wgsl (100%) rename player/tests/{ => player}/data/zero-init-texture-copytobuffer.ron (100%) rename player/tests/{ => player}/data/zero-init-texture-rendertarget.ron (100%) rename player/tests/{root.rs => player/main.rs} (99%) rename tests/{compile-tests => tests/wgpu-compile}/fail/cpass_lifetime.rs (100%) rename tests/{compile-tests => tests/wgpu-compile}/fail/cpass_lifetime.stderr (100%) rename tests/{compile-tests => tests/wgpu-compile}/fail/rpass_lifetime.rs (100%) rename tests/{compile-tests => tests/wgpu-compile}/fail/rpass_lifetime.stderr (100%) rename tests/{compile-tests/root.rs => tests/wgpu-compile/main.rs} (100%) rename tests/{dependency-tests/root.rs => tests/wgpu-dependency/main.rs} (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/3x3_colors.png (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/bgra8unorm_storage.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/bind_group_layout_dedup.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/bind_groups.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/binding_array/buffers.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/binding_array/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/binding_array/sampled_textures.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/binding_array/samplers.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/binding_array/storage_textures.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/buffer.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/buffer_copy.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/buffer_usages.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/clear_texture.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/cloneable_types.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/compute_pass_ownership.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/create_surface_error.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/device.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/dispatch_workgroups_indirect.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/draw_indirect.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/dual_source_blending.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/encoder.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/external_texture.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/float32_filterable.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/image_atomics/image_32_atomics.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/image_atomics/image_64_atomics.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/image_atomics/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/instance.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/life_cycle.rs (100%) rename tests/{gpu-tests/root.rs => tests/wgpu-gpu/main.rs} (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/mem_leaks.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/nv12_texture/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/nv12_texture/nv12_texture.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/occlusion_query/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/occlusion_query/shader.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/oob_indexing.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/pipeline.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/pipeline_cache.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/poll.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/push_constants.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/query_set.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/queue_transfer.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/ray_tracing/as_build.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/ray_tracing/as_create.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/ray_tracing/as_use_after_free.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/ray_tracing/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/ray_tracing/scene/mesh_gen.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/ray_tracing/scene/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/ray_tracing/shader.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/ray_tracing/shader.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_3349.fs.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_3349.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_3349.vs.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_3457.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_3457.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_4024.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_4122.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_4485.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_4485.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_4514.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_4514.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_5553.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_5553.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_6317.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_6467.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/regression/issue_6827.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/render_pass_ownership.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/resource_descriptor_accessor.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/resource_error.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/samplers.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/scissor_tests/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/scissor_tests/solid_white.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader/array_size_overrides.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader/compilation_messages/error_shader.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader/compilation_messages/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader/compilation_messages/successful_shader.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader/data_builtins.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader/numeric_builtins.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader/shader_test.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader/struct_layout.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader/workgroup_size_overrides.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader/zero_init_workgroup_mem.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader/zero_init_workgroup_mem.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader_primitive_index/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader_primitive_index/primitive_index.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader_view_format/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/shader_view_format/view_format.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/subgroup_operations/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/subgroup_operations/shader.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/texture_binding/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/texture_binding/shader.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/texture_binding/single_scalar.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/texture_blit.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/texture_bounds.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/texture_view_creation.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/transfer.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/transition_resources.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/vertex_formats/draw.vert.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/vertex_formats/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/vertex_indices/draw.vert.wgsl (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/vertex_indices/mod.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/write_texture.rs (100%) rename tests/{gpu-tests => tests/wgpu-gpu}/zero_init_texture_after_discard.rs (100%) rename tests/{validation-tests => tests/wgpu-validation}/api/binding_arrays.rs (100%) rename tests/{validation-tests => tests/wgpu-validation}/api/buffer.rs (100%) rename tests/{validation-tests => tests/wgpu-validation}/api/buffer_slice.rs (100%) rename tests/{validation-tests => tests/wgpu-validation}/api/instance.rs (100%) rename tests/{validation-tests => tests/wgpu-validation}/api/mod.rs (100%) rename tests/{validation-tests => tests/wgpu-validation}/api/texture.rs (100%) rename tests/{validation-tests/root.rs => tests/wgpu-validation/main.rs} (100%) rename tests/{validation-tests => tests/wgpu-validation}/noop.rs (100%) diff --git a/benches/Cargo.toml b/benches/Cargo.toml index c018aba58..f0b70229a 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -9,13 +9,11 @@ repository.workspace = true keywords.workspace = true license.workspace = true rust-version.workspace = true -autobenches = false publish = false [[bench]] name = "wgpu-benchmark" harness = false -path = "benches/root.rs" [features] # Uncomment these features to enable tracy and superluminal profiling. diff --git a/benches/benches/bind_groups.rs b/benches/benches/wgpu-benchmark/bind_groups.rs similarity index 100% rename from benches/benches/bind_groups.rs rename to benches/benches/wgpu-benchmark/bind_groups.rs diff --git a/benches/benches/computepass-bindless.wgsl b/benches/benches/wgpu-benchmark/computepass-bindless.wgsl similarity index 100% rename from benches/benches/computepass-bindless.wgsl rename to benches/benches/wgpu-benchmark/computepass-bindless.wgsl diff --git a/benches/benches/computepass.rs b/benches/benches/wgpu-benchmark/computepass.rs similarity index 100% rename from benches/benches/computepass.rs rename to benches/benches/wgpu-benchmark/computepass.rs diff --git a/benches/benches/computepass.wgsl b/benches/benches/wgpu-benchmark/computepass.wgsl similarity index 100% rename from benches/benches/computepass.wgsl rename to benches/benches/wgpu-benchmark/computepass.wgsl diff --git a/benches/benches/root.rs b/benches/benches/wgpu-benchmark/main.rs similarity index 100% rename from benches/benches/root.rs rename to benches/benches/wgpu-benchmark/main.rs diff --git a/benches/benches/renderpass-bindless.wgsl b/benches/benches/wgpu-benchmark/renderpass-bindless.wgsl similarity index 100% rename from benches/benches/renderpass-bindless.wgsl rename to benches/benches/wgpu-benchmark/renderpass-bindless.wgsl diff --git a/benches/benches/renderpass.rs b/benches/benches/wgpu-benchmark/renderpass.rs similarity index 100% rename from benches/benches/renderpass.rs rename to benches/benches/wgpu-benchmark/renderpass.rs diff --git a/benches/benches/renderpass.wgsl b/benches/benches/wgpu-benchmark/renderpass.wgsl similarity index 100% rename from benches/benches/renderpass.wgsl rename to benches/benches/wgpu-benchmark/renderpass.wgsl diff --git a/benches/benches/resource_creation.rs b/benches/benches/wgpu-benchmark/resource_creation.rs similarity index 100% rename from benches/benches/resource_creation.rs rename to benches/benches/wgpu-benchmark/resource_creation.rs diff --git a/benches/benches/shader.rs b/benches/benches/wgpu-benchmark/shader.rs similarity index 99% rename from benches/benches/shader.rs rename to benches/benches/wgpu-benchmark/shader.rs index fee85adbf..71552d8be 100644 --- a/benches/benches/shader.rs +++ b/benches/benches/wgpu-benchmark/shader.rs @@ -15,6 +15,7 @@ struct Inputs { } impl Inputs { + #[track_caller] fn from_dir(folder: &str, extension: &str) -> Self { let mut inputs = Vec::new(); let read_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")) diff --git a/docs/testing.md b/docs/testing.md index 1ddf86a56..dcca39404 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -36,10 +36,10 @@ This is a table of contents, in the form of the repository's directory structure - player - [tests](#player-tests) - tests - - [compile-tests](#wgpu-compile-tests) - - [dependency-tests](#wgpu-dependency-tests) - - [gpu-tests](#wgpu-gpu-tests) - - [validation-tests](#wgpu-validation-tests) + - [compile](#wgpu-compile-tests) + - [dependency](#wgpu-dependency-tests) + - [gpu](#wgpu-gpu-tests) + - [validation](#wgpu-validation-tests) And where applicable [unit-tests](#unit-tests) are scatteredthroughout the codebase. @@ -84,16 +84,16 @@ they should be easy to copy into a standalone project. ## `naga` Example Tests -- Located in: `naga/tests/example_wgsl` -- Run with `cargo nextest run --test naga-test example_wgsl` +- Located in: `naga/tests/naga/example_wgsl` +- Run with `cargo nextest run --test naga example_wgsl` This simple test ensures that all wgsl files in the `examples` directory can be parsed by `naga`'s `wgsl` parser and validate correctly. ## `naga` Snapshot Tests -- Located in: `naga/tests/snapshot`, `naga/tests/in`, and `naga/tests/out` -- Run with `cargo nextest run --test naga-test snapshots` +- Located in: `naga/tests/naga/snapshot`, `naga/tests/in`, and `naga/tests/out` +- Run with `cargo nextest run --test naga snapshots` - Data driven snapshot tests for `naga`'s input/output. These tests are snapshot tests for `naga`s parsers and code generators. @@ -118,8 +118,8 @@ will use the respective tool to validate the generated code. ## `naga` SPIR-V Capabilities Tests -- Located in: `naga/tests/spirv_capabilities` -- Run with `cargo nextest run --test naga-test spirv_capabilities` +- Located in: `naga/tests/naga/spirv_capabilities` +- Run with `cargo nextest run --test naga spirv_capabilities` - Uses the standard `#[test]` harness. These tests convert the given wgsl snippet to spirv and @@ -127,8 +127,8 @@ then assert that the spirv has enabled the expected capabilities. ## `naga` Validation Tests -- Located in: `naga/tests/validation` -- Run with `cargo nextest run --test naga-test validation` +- Located in: `naga/tests/naga/validation` +- Run with `cargo nextest run --test naga validation` These are hand rolled tests against the naga's validator. If you don't need to test the validator with a custom module, @@ -137,8 +137,8 @@ the [wgsl errors](#naga-wgsl-error-tests) tests. ## `naga` WGSL Error Tests -- Located in: `naga/tests/wgsl_errors` -- Run with `cargo nextest run --test naga-test wgsl_errors` +- Located in: `naga/tests/naga/wgsl_errors` +- Run with `cargo nextest run --test naga wgsl_errors` These are tests for the error messages that the `wgsl` frontend produces. Additionally you can check that a given validation error @@ -147,7 +147,7 @@ is produced by the validator from a given `wgsl` snippet. ## `player` Tests - Located in: `player/tests` -- Run with `cargo nextest run --test player-test` +- Run with `cargo nextest run --test player` - Data driven tests using the `player`'s replay system. - `wgpu` integration tests. @@ -161,9 +161,9 @@ These tests only run on your system's default GPU. ## `wgpu` Compile Tests -- Located in: `tests/compile-tests` -- Run with `cargo nextest run --test wgpu-compile-test` -- `trybuild` tests of all rust files in `tests/compile-tests/fail` directory. +- Located in: `tests/tests/wgpu-compile` +- Run with `cargo nextest run --test wgpu-compile` +- `trybuild` tests of all rust files in `tests/tests/wgpu-compile/fail` directory. These use the `trybuild` crate to test a few scenarios where the `wgpu` crate is expected to fail to compile. This mainly @@ -172,8 +172,8 @@ dropping passes, etc. ## `wgpu` Dependency Tests -- Located in: `tests/dependency-tests` -- Run with `cargo nextest run --test wgpu-dependency-test` +- Located in: `tests/tests/wgpu-dependency` +- Run with `cargo nextest run --test wgpu-dependency` - Tests against `cargo tree`. These tests ensure that the `wgpu` crate has the correct dependency @@ -184,8 +184,8 @@ This provides a way to ensure that our `toml` files are correct. ## `wgpu` GPU Tests -- Located in: `tests/gpu-tests` -- Run with `cargo xtask test --test wgpu-gpu-test` +- Located in: `tests/tests/wgpu-gpu` +- Run with `cargo xtask test --test wgpu-gpu` - Uses a custom `#[gpu_test]` harness. - `wgpu` integration tests, with access to `wgpu_test` helpers. @@ -209,8 +209,8 @@ See also the [example tests](#example-tests) for additional GPU tests. ## `wgpu` Validation Tests -- Located in: `tests/validation-tests` -- Run with `cargo nextest run --test wgpu-validation-test` +- Located in: `tests/tests/wgpu-validation` +- Run with `cargo nextest run --test wgpu-validation` - Use the standard `#[test]` harness. - `wgpu` integration tests, with access to `wgpu_test` helpers. diff --git a/naga/.gitattributes b/naga/.gitattributes index 622c348d1..1f0bd06f0 100644 --- a/naga/.gitattributes +++ b/naga/.gitattributes @@ -1 +1 @@ -tests/out/**/* text eol=lf +tests/naga/out/**/* text eol=lf diff --git a/naga/Cargo.toml b/naga/Cargo.toml index 1aa53e57a..d04bdc60b 100644 --- a/naga/Cargo.toml +++ b/naga/Cargo.toml @@ -9,7 +9,6 @@ keywords = ["shader", "SPIR-V", "GLSL", "MSL"] license = "MIT OR Apache-2.0" exclude = ["bin/**/*", "tests/**/*", "Cargo.lock", "target/**/*"] resolver = "2" -autotests = false # Override the workspace's `rust-version` key. Firefox uses `cargo vendor` to # copy the crates it actually uses out of the workspace, so it's meaningful for @@ -17,10 +16,6 @@ autotests = false # whole, if their code permits. See `../README.md` for details. rust-version = "1.82.0" -[[test]] -name = "naga-test" -path = "tests/root.rs" - [package.metadata.docs.rs] all-features = true diff --git a/naga/tests/example_wgsl.rs b/naga/tests/naga/example_wgsl.rs similarity index 100% rename from naga/tests/example_wgsl.rs rename to naga/tests/naga/example_wgsl.rs diff --git a/naga/tests/root.rs b/naga/tests/naga/main.rs similarity index 100% rename from naga/tests/root.rs rename to naga/tests/naga/main.rs diff --git a/naga/tests/snapshots.rs b/naga/tests/naga/snapshots.rs similarity index 100% rename from naga/tests/snapshots.rs rename to naga/tests/naga/snapshots.rs diff --git a/naga/tests/spirv_capabilities.rs b/naga/tests/naga/spirv_capabilities.rs similarity index 100% rename from naga/tests/spirv_capabilities.rs rename to naga/tests/naga/spirv_capabilities.rs diff --git a/naga/tests/validation.rs b/naga/tests/naga/validation.rs similarity index 100% rename from naga/tests/validation.rs rename to naga/tests/naga/validation.rs diff --git a/naga/tests/wgsl_errors.rs b/naga/tests/naga/wgsl_errors.rs similarity index 100% rename from naga/tests/wgsl_errors.rs rename to naga/tests/naga/wgsl_errors.rs diff --git a/player/Cargo.toml b/player/Cargo.toml index bf5297017..0f0346ece 100644 --- a/player/Cargo.toml +++ b/player/Cargo.toml @@ -12,19 +12,12 @@ rust-version.workspace = true publish = false [lib] -name = "player" -path = "src/lib.rs" test = false [[bin]] name = "play" -path = "src/bin/play.rs" test = false -[[test]] -name = "player-test" -path = "tests/root.rs" - [dependencies] wgpu-types = { workspace = true, features = ["serde"] } diff --git a/player/tests/data/all.ron b/player/tests/player/data/all.ron similarity index 100% rename from player/tests/data/all.ron rename to player/tests/player/data/all.ron diff --git a/player/tests/data/bind-group.ron b/player/tests/player/data/bind-group.ron similarity index 100% rename from player/tests/data/bind-group.ron rename to player/tests/player/data/bind-group.ron diff --git a/player/tests/data/buffer-copy.ron b/player/tests/player/data/buffer-copy.ron similarity index 100% rename from player/tests/data/buffer-copy.ron rename to player/tests/player/data/buffer-copy.ron diff --git a/player/tests/data/clear-buffer-texture.ron b/player/tests/player/data/clear-buffer-texture.ron similarity index 100% rename from player/tests/data/clear-buffer-texture.ron rename to player/tests/player/data/clear-buffer-texture.ron diff --git a/player/tests/data/clear-texture.bin b/player/tests/player/data/clear-texture.bin similarity index 100% rename from player/tests/data/clear-texture.bin rename to player/tests/player/data/clear-texture.bin diff --git a/player/tests/data/data1.bin b/player/tests/player/data/data1.bin similarity index 100% rename from player/tests/data/data1.bin rename to player/tests/player/data/data1.bin diff --git a/player/tests/data/empty.wgsl b/player/tests/player/data/empty.wgsl similarity index 100% rename from player/tests/data/empty.wgsl rename to player/tests/player/data/empty.wgsl diff --git a/player/tests/data/pipeline-statistics-query.ron b/player/tests/player/data/pipeline-statistics-query.ron similarity index 100% rename from player/tests/data/pipeline-statistics-query.ron rename to player/tests/player/data/pipeline-statistics-query.ron diff --git a/player/tests/data/quad.bin b/player/tests/player/data/quad.bin similarity index 100% rename from player/tests/data/quad.bin rename to player/tests/player/data/quad.bin diff --git a/player/tests/data/quad.ron b/player/tests/player/data/quad.ron similarity index 100% rename from player/tests/data/quad.ron rename to player/tests/player/data/quad.ron diff --git a/player/tests/data/quad.wgsl b/player/tests/player/data/quad.wgsl similarity index 100% rename from player/tests/data/quad.wgsl rename to player/tests/player/data/quad.wgsl diff --git a/player/tests/data/zero-16k.bin b/player/tests/player/data/zero-16k.bin similarity index 100% rename from player/tests/data/zero-16k.bin rename to player/tests/player/data/zero-16k.bin diff --git a/player/tests/data/zero-init-buffer-for-binding.wgsl b/player/tests/player/data/zero-init-buffer-for-binding.wgsl similarity index 100% rename from player/tests/data/zero-init-buffer-for-binding.wgsl rename to player/tests/player/data/zero-init-buffer-for-binding.wgsl diff --git a/player/tests/data/zero-init-buffer.ron b/player/tests/player/data/zero-init-buffer.ron similarity index 100% rename from player/tests/data/zero-init-buffer.ron rename to player/tests/player/data/zero-init-buffer.ron diff --git a/player/tests/data/zero-init-texture-binding.ron b/player/tests/player/data/zero-init-texture-binding.ron similarity index 100% rename from player/tests/data/zero-init-texture-binding.ron rename to player/tests/player/data/zero-init-texture-binding.ron diff --git a/player/tests/data/zero-init-texture-binding.wgsl b/player/tests/player/data/zero-init-texture-binding.wgsl similarity index 100% rename from player/tests/data/zero-init-texture-binding.wgsl rename to player/tests/player/data/zero-init-texture-binding.wgsl diff --git a/player/tests/data/zero-init-texture-copytobuffer.ron b/player/tests/player/data/zero-init-texture-copytobuffer.ron similarity index 100% rename from player/tests/data/zero-init-texture-copytobuffer.ron rename to player/tests/player/data/zero-init-texture-copytobuffer.ron diff --git a/player/tests/data/zero-init-texture-rendertarget.ron b/player/tests/player/data/zero-init-texture-rendertarget.ron similarity index 100% rename from player/tests/data/zero-init-texture-rendertarget.ron rename to player/tests/player/data/zero-init-texture-rendertarget.ron diff --git a/player/tests/root.rs b/player/tests/player/main.rs similarity index 99% rename from player/tests/root.rs rename to player/tests/player/main.rs index 44491a5f4..18f76e76e 100644 --- a/player/tests/root.rs +++ b/player/tests/player/main.rs @@ -246,5 +246,5 @@ impl Corpus { fn test_api() { env_logger::init(); - Corpus::run_from(PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/data/all.ron")) + Corpus::run_from(PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/player/data/all.ron")) } diff --git a/tests/Cargo.toml b/tests/Cargo.toml index fe1f98a05..110f1dcd0 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -9,27 +9,22 @@ repository.workspace = true keywords.workspace = true license.workspace = true rust-version.workspace = true -autotests = false publish = false [[test]] -name = "wgpu-compile-test" -path = "compile-tests/root.rs" +name = "wgpu-compile" harness = true [[test]] -name = "wgpu-dependency-test" -path = "dependency-tests/root.rs" +name = "wgpu-dependency" harness = true [[test]] -name = "wgpu-gpu-test" -path = "gpu-tests/root.rs" +name = "wgpu-gpu" harness = false [[test]] -name = "wgpu-validation-test" -path = "validation-tests/root.rs" +name = "wgpu-validation" harness = true [features] diff --git a/tests/compile-tests/fail/cpass_lifetime.rs b/tests/tests/wgpu-compile/fail/cpass_lifetime.rs similarity index 100% rename from tests/compile-tests/fail/cpass_lifetime.rs rename to tests/tests/wgpu-compile/fail/cpass_lifetime.rs diff --git a/tests/compile-tests/fail/cpass_lifetime.stderr b/tests/tests/wgpu-compile/fail/cpass_lifetime.stderr similarity index 100% rename from tests/compile-tests/fail/cpass_lifetime.stderr rename to tests/tests/wgpu-compile/fail/cpass_lifetime.stderr diff --git a/tests/compile-tests/fail/rpass_lifetime.rs b/tests/tests/wgpu-compile/fail/rpass_lifetime.rs similarity index 100% rename from tests/compile-tests/fail/rpass_lifetime.rs rename to tests/tests/wgpu-compile/fail/rpass_lifetime.rs diff --git a/tests/compile-tests/fail/rpass_lifetime.stderr b/tests/tests/wgpu-compile/fail/rpass_lifetime.stderr similarity index 100% rename from tests/compile-tests/fail/rpass_lifetime.stderr rename to tests/tests/wgpu-compile/fail/rpass_lifetime.stderr diff --git a/tests/compile-tests/root.rs b/tests/tests/wgpu-compile/main.rs similarity index 100% rename from tests/compile-tests/root.rs rename to tests/tests/wgpu-compile/main.rs diff --git a/tests/dependency-tests/root.rs b/tests/tests/wgpu-dependency/main.rs similarity index 100% rename from tests/dependency-tests/root.rs rename to tests/tests/wgpu-dependency/main.rs diff --git a/tests/gpu-tests/3x3_colors.png b/tests/tests/wgpu-gpu/3x3_colors.png similarity index 100% rename from tests/gpu-tests/3x3_colors.png rename to tests/tests/wgpu-gpu/3x3_colors.png diff --git a/tests/gpu-tests/bgra8unorm_storage.rs b/tests/tests/wgpu-gpu/bgra8unorm_storage.rs similarity index 100% rename from tests/gpu-tests/bgra8unorm_storage.rs rename to tests/tests/wgpu-gpu/bgra8unorm_storage.rs diff --git a/tests/gpu-tests/bind_group_layout_dedup.rs b/tests/tests/wgpu-gpu/bind_group_layout_dedup.rs similarity index 100% rename from tests/gpu-tests/bind_group_layout_dedup.rs rename to tests/tests/wgpu-gpu/bind_group_layout_dedup.rs diff --git a/tests/gpu-tests/bind_groups.rs b/tests/tests/wgpu-gpu/bind_groups.rs similarity index 100% rename from tests/gpu-tests/bind_groups.rs rename to tests/tests/wgpu-gpu/bind_groups.rs diff --git a/tests/gpu-tests/binding_array/buffers.rs b/tests/tests/wgpu-gpu/binding_array/buffers.rs similarity index 100% rename from tests/gpu-tests/binding_array/buffers.rs rename to tests/tests/wgpu-gpu/binding_array/buffers.rs diff --git a/tests/gpu-tests/binding_array/mod.rs b/tests/tests/wgpu-gpu/binding_array/mod.rs similarity index 100% rename from tests/gpu-tests/binding_array/mod.rs rename to tests/tests/wgpu-gpu/binding_array/mod.rs diff --git a/tests/gpu-tests/binding_array/sampled_textures.rs b/tests/tests/wgpu-gpu/binding_array/sampled_textures.rs similarity index 100% rename from tests/gpu-tests/binding_array/sampled_textures.rs rename to tests/tests/wgpu-gpu/binding_array/sampled_textures.rs diff --git a/tests/gpu-tests/binding_array/samplers.rs b/tests/tests/wgpu-gpu/binding_array/samplers.rs similarity index 100% rename from tests/gpu-tests/binding_array/samplers.rs rename to tests/tests/wgpu-gpu/binding_array/samplers.rs diff --git a/tests/gpu-tests/binding_array/storage_textures.rs b/tests/tests/wgpu-gpu/binding_array/storage_textures.rs similarity index 100% rename from tests/gpu-tests/binding_array/storage_textures.rs rename to tests/tests/wgpu-gpu/binding_array/storage_textures.rs diff --git a/tests/gpu-tests/buffer.rs b/tests/tests/wgpu-gpu/buffer.rs similarity index 100% rename from tests/gpu-tests/buffer.rs rename to tests/tests/wgpu-gpu/buffer.rs diff --git a/tests/gpu-tests/buffer_copy.rs b/tests/tests/wgpu-gpu/buffer_copy.rs similarity index 100% rename from tests/gpu-tests/buffer_copy.rs rename to tests/tests/wgpu-gpu/buffer_copy.rs diff --git a/tests/gpu-tests/buffer_usages.rs b/tests/tests/wgpu-gpu/buffer_usages.rs similarity index 100% rename from tests/gpu-tests/buffer_usages.rs rename to tests/tests/wgpu-gpu/buffer_usages.rs diff --git a/tests/gpu-tests/clear_texture.rs b/tests/tests/wgpu-gpu/clear_texture.rs similarity index 100% rename from tests/gpu-tests/clear_texture.rs rename to tests/tests/wgpu-gpu/clear_texture.rs diff --git a/tests/gpu-tests/cloneable_types.rs b/tests/tests/wgpu-gpu/cloneable_types.rs similarity index 100% rename from tests/gpu-tests/cloneable_types.rs rename to tests/tests/wgpu-gpu/cloneable_types.rs diff --git a/tests/gpu-tests/compute_pass_ownership.rs b/tests/tests/wgpu-gpu/compute_pass_ownership.rs similarity index 100% rename from tests/gpu-tests/compute_pass_ownership.rs rename to tests/tests/wgpu-gpu/compute_pass_ownership.rs diff --git a/tests/gpu-tests/create_surface_error.rs b/tests/tests/wgpu-gpu/create_surface_error.rs similarity index 100% rename from tests/gpu-tests/create_surface_error.rs rename to tests/tests/wgpu-gpu/create_surface_error.rs diff --git a/tests/gpu-tests/device.rs b/tests/tests/wgpu-gpu/device.rs similarity index 100% rename from tests/gpu-tests/device.rs rename to tests/tests/wgpu-gpu/device.rs diff --git a/tests/gpu-tests/dispatch_workgroups_indirect.rs b/tests/tests/wgpu-gpu/dispatch_workgroups_indirect.rs similarity index 100% rename from tests/gpu-tests/dispatch_workgroups_indirect.rs rename to tests/tests/wgpu-gpu/dispatch_workgroups_indirect.rs diff --git a/tests/gpu-tests/draw_indirect.rs b/tests/tests/wgpu-gpu/draw_indirect.rs similarity index 100% rename from tests/gpu-tests/draw_indirect.rs rename to tests/tests/wgpu-gpu/draw_indirect.rs diff --git a/tests/gpu-tests/dual_source_blending.rs b/tests/tests/wgpu-gpu/dual_source_blending.rs similarity index 100% rename from tests/gpu-tests/dual_source_blending.rs rename to tests/tests/wgpu-gpu/dual_source_blending.rs diff --git a/tests/gpu-tests/encoder.rs b/tests/tests/wgpu-gpu/encoder.rs similarity index 100% rename from tests/gpu-tests/encoder.rs rename to tests/tests/wgpu-gpu/encoder.rs diff --git a/tests/gpu-tests/external_texture.rs b/tests/tests/wgpu-gpu/external_texture.rs similarity index 100% rename from tests/gpu-tests/external_texture.rs rename to tests/tests/wgpu-gpu/external_texture.rs diff --git a/tests/gpu-tests/float32_filterable.rs b/tests/tests/wgpu-gpu/float32_filterable.rs similarity index 100% rename from tests/gpu-tests/float32_filterable.rs rename to tests/tests/wgpu-gpu/float32_filterable.rs diff --git a/tests/gpu-tests/image_atomics/image_32_atomics.wgsl b/tests/tests/wgpu-gpu/image_atomics/image_32_atomics.wgsl similarity index 100% rename from tests/gpu-tests/image_atomics/image_32_atomics.wgsl rename to tests/tests/wgpu-gpu/image_atomics/image_32_atomics.wgsl diff --git a/tests/gpu-tests/image_atomics/image_64_atomics.wgsl b/tests/tests/wgpu-gpu/image_atomics/image_64_atomics.wgsl similarity index 100% rename from tests/gpu-tests/image_atomics/image_64_atomics.wgsl rename to tests/tests/wgpu-gpu/image_atomics/image_64_atomics.wgsl diff --git a/tests/gpu-tests/image_atomics/mod.rs b/tests/tests/wgpu-gpu/image_atomics/mod.rs similarity index 100% rename from tests/gpu-tests/image_atomics/mod.rs rename to tests/tests/wgpu-gpu/image_atomics/mod.rs diff --git a/tests/gpu-tests/instance.rs b/tests/tests/wgpu-gpu/instance.rs similarity index 100% rename from tests/gpu-tests/instance.rs rename to tests/tests/wgpu-gpu/instance.rs diff --git a/tests/gpu-tests/life_cycle.rs b/tests/tests/wgpu-gpu/life_cycle.rs similarity index 100% rename from tests/gpu-tests/life_cycle.rs rename to tests/tests/wgpu-gpu/life_cycle.rs diff --git a/tests/gpu-tests/root.rs b/tests/tests/wgpu-gpu/main.rs similarity index 100% rename from tests/gpu-tests/root.rs rename to tests/tests/wgpu-gpu/main.rs diff --git a/tests/gpu-tests/mem_leaks.rs b/tests/tests/wgpu-gpu/mem_leaks.rs similarity index 100% rename from tests/gpu-tests/mem_leaks.rs rename to tests/tests/wgpu-gpu/mem_leaks.rs diff --git a/tests/gpu-tests/nv12_texture/mod.rs b/tests/tests/wgpu-gpu/nv12_texture/mod.rs similarity index 100% rename from tests/gpu-tests/nv12_texture/mod.rs rename to tests/tests/wgpu-gpu/nv12_texture/mod.rs diff --git a/tests/gpu-tests/nv12_texture/nv12_texture.wgsl b/tests/tests/wgpu-gpu/nv12_texture/nv12_texture.wgsl similarity index 100% rename from tests/gpu-tests/nv12_texture/nv12_texture.wgsl rename to tests/tests/wgpu-gpu/nv12_texture/nv12_texture.wgsl diff --git a/tests/gpu-tests/occlusion_query/mod.rs b/tests/tests/wgpu-gpu/occlusion_query/mod.rs similarity index 100% rename from tests/gpu-tests/occlusion_query/mod.rs rename to tests/tests/wgpu-gpu/occlusion_query/mod.rs diff --git a/tests/gpu-tests/occlusion_query/shader.wgsl b/tests/tests/wgpu-gpu/occlusion_query/shader.wgsl similarity index 100% rename from tests/gpu-tests/occlusion_query/shader.wgsl rename to tests/tests/wgpu-gpu/occlusion_query/shader.wgsl diff --git a/tests/gpu-tests/oob_indexing.rs b/tests/tests/wgpu-gpu/oob_indexing.rs similarity index 100% rename from tests/gpu-tests/oob_indexing.rs rename to tests/tests/wgpu-gpu/oob_indexing.rs diff --git a/tests/gpu-tests/pipeline.rs b/tests/tests/wgpu-gpu/pipeline.rs similarity index 100% rename from tests/gpu-tests/pipeline.rs rename to tests/tests/wgpu-gpu/pipeline.rs diff --git a/tests/gpu-tests/pipeline_cache.rs b/tests/tests/wgpu-gpu/pipeline_cache.rs similarity index 100% rename from tests/gpu-tests/pipeline_cache.rs rename to tests/tests/wgpu-gpu/pipeline_cache.rs diff --git a/tests/gpu-tests/poll.rs b/tests/tests/wgpu-gpu/poll.rs similarity index 100% rename from tests/gpu-tests/poll.rs rename to tests/tests/wgpu-gpu/poll.rs diff --git a/tests/gpu-tests/push_constants.rs b/tests/tests/wgpu-gpu/push_constants.rs similarity index 100% rename from tests/gpu-tests/push_constants.rs rename to tests/tests/wgpu-gpu/push_constants.rs diff --git a/tests/gpu-tests/query_set.rs b/tests/tests/wgpu-gpu/query_set.rs similarity index 100% rename from tests/gpu-tests/query_set.rs rename to tests/tests/wgpu-gpu/query_set.rs diff --git a/tests/gpu-tests/queue_transfer.rs b/tests/tests/wgpu-gpu/queue_transfer.rs similarity index 100% rename from tests/gpu-tests/queue_transfer.rs rename to tests/tests/wgpu-gpu/queue_transfer.rs diff --git a/tests/gpu-tests/ray_tracing/as_build.rs b/tests/tests/wgpu-gpu/ray_tracing/as_build.rs similarity index 100% rename from tests/gpu-tests/ray_tracing/as_build.rs rename to tests/tests/wgpu-gpu/ray_tracing/as_build.rs diff --git a/tests/gpu-tests/ray_tracing/as_create.rs b/tests/tests/wgpu-gpu/ray_tracing/as_create.rs similarity index 100% rename from tests/gpu-tests/ray_tracing/as_create.rs rename to tests/tests/wgpu-gpu/ray_tracing/as_create.rs diff --git a/tests/gpu-tests/ray_tracing/as_use_after_free.rs b/tests/tests/wgpu-gpu/ray_tracing/as_use_after_free.rs similarity index 100% rename from tests/gpu-tests/ray_tracing/as_use_after_free.rs rename to tests/tests/wgpu-gpu/ray_tracing/as_use_after_free.rs diff --git a/tests/gpu-tests/ray_tracing/mod.rs b/tests/tests/wgpu-gpu/ray_tracing/mod.rs similarity index 100% rename from tests/gpu-tests/ray_tracing/mod.rs rename to tests/tests/wgpu-gpu/ray_tracing/mod.rs diff --git a/tests/gpu-tests/ray_tracing/scene/mesh_gen.rs b/tests/tests/wgpu-gpu/ray_tracing/scene/mesh_gen.rs similarity index 100% rename from tests/gpu-tests/ray_tracing/scene/mesh_gen.rs rename to tests/tests/wgpu-gpu/ray_tracing/scene/mesh_gen.rs diff --git a/tests/gpu-tests/ray_tracing/scene/mod.rs b/tests/tests/wgpu-gpu/ray_tracing/scene/mod.rs similarity index 100% rename from tests/gpu-tests/ray_tracing/scene/mod.rs rename to tests/tests/wgpu-gpu/ray_tracing/scene/mod.rs diff --git a/tests/gpu-tests/ray_tracing/shader.rs b/tests/tests/wgpu-gpu/ray_tracing/shader.rs similarity index 100% rename from tests/gpu-tests/ray_tracing/shader.rs rename to tests/tests/wgpu-gpu/ray_tracing/shader.rs diff --git a/tests/gpu-tests/ray_tracing/shader.wgsl b/tests/tests/wgpu-gpu/ray_tracing/shader.wgsl similarity index 100% rename from tests/gpu-tests/ray_tracing/shader.wgsl rename to tests/tests/wgpu-gpu/ray_tracing/shader.wgsl diff --git a/tests/gpu-tests/regression/issue_3349.fs.wgsl b/tests/tests/wgpu-gpu/regression/issue_3349.fs.wgsl similarity index 100% rename from tests/gpu-tests/regression/issue_3349.fs.wgsl rename to tests/tests/wgpu-gpu/regression/issue_3349.fs.wgsl diff --git a/tests/gpu-tests/regression/issue_3349.rs b/tests/tests/wgpu-gpu/regression/issue_3349.rs similarity index 100% rename from tests/gpu-tests/regression/issue_3349.rs rename to tests/tests/wgpu-gpu/regression/issue_3349.rs diff --git a/tests/gpu-tests/regression/issue_3349.vs.wgsl b/tests/tests/wgpu-gpu/regression/issue_3349.vs.wgsl similarity index 100% rename from tests/gpu-tests/regression/issue_3349.vs.wgsl rename to tests/tests/wgpu-gpu/regression/issue_3349.vs.wgsl diff --git a/tests/gpu-tests/regression/issue_3457.rs b/tests/tests/wgpu-gpu/regression/issue_3457.rs similarity index 100% rename from tests/gpu-tests/regression/issue_3457.rs rename to tests/tests/wgpu-gpu/regression/issue_3457.rs diff --git a/tests/gpu-tests/regression/issue_3457.wgsl b/tests/tests/wgpu-gpu/regression/issue_3457.wgsl similarity index 100% rename from tests/gpu-tests/regression/issue_3457.wgsl rename to tests/tests/wgpu-gpu/regression/issue_3457.wgsl diff --git a/tests/gpu-tests/regression/issue_4024.rs b/tests/tests/wgpu-gpu/regression/issue_4024.rs similarity index 100% rename from tests/gpu-tests/regression/issue_4024.rs rename to tests/tests/wgpu-gpu/regression/issue_4024.rs diff --git a/tests/gpu-tests/regression/issue_4122.rs b/tests/tests/wgpu-gpu/regression/issue_4122.rs similarity index 100% rename from tests/gpu-tests/regression/issue_4122.rs rename to tests/tests/wgpu-gpu/regression/issue_4122.rs diff --git a/tests/gpu-tests/regression/issue_4485.rs b/tests/tests/wgpu-gpu/regression/issue_4485.rs similarity index 100% rename from tests/gpu-tests/regression/issue_4485.rs rename to tests/tests/wgpu-gpu/regression/issue_4485.rs diff --git a/tests/gpu-tests/regression/issue_4485.wgsl b/tests/tests/wgpu-gpu/regression/issue_4485.wgsl similarity index 100% rename from tests/gpu-tests/regression/issue_4485.wgsl rename to tests/tests/wgpu-gpu/regression/issue_4485.wgsl diff --git a/tests/gpu-tests/regression/issue_4514.rs b/tests/tests/wgpu-gpu/regression/issue_4514.rs similarity index 100% rename from tests/gpu-tests/regression/issue_4514.rs rename to tests/tests/wgpu-gpu/regression/issue_4514.rs diff --git a/tests/gpu-tests/regression/issue_4514.wgsl b/tests/tests/wgpu-gpu/regression/issue_4514.wgsl similarity index 100% rename from tests/gpu-tests/regression/issue_4514.wgsl rename to tests/tests/wgpu-gpu/regression/issue_4514.wgsl diff --git a/tests/gpu-tests/regression/issue_5553.rs b/tests/tests/wgpu-gpu/regression/issue_5553.rs similarity index 100% rename from tests/gpu-tests/regression/issue_5553.rs rename to tests/tests/wgpu-gpu/regression/issue_5553.rs diff --git a/tests/gpu-tests/regression/issue_5553.wgsl b/tests/tests/wgpu-gpu/regression/issue_5553.wgsl similarity index 100% rename from tests/gpu-tests/regression/issue_5553.wgsl rename to tests/tests/wgpu-gpu/regression/issue_5553.wgsl diff --git a/tests/gpu-tests/regression/issue_6317.rs b/tests/tests/wgpu-gpu/regression/issue_6317.rs similarity index 100% rename from tests/gpu-tests/regression/issue_6317.rs rename to tests/tests/wgpu-gpu/regression/issue_6317.rs diff --git a/tests/gpu-tests/regression/issue_6467.rs b/tests/tests/wgpu-gpu/regression/issue_6467.rs similarity index 100% rename from tests/gpu-tests/regression/issue_6467.rs rename to tests/tests/wgpu-gpu/regression/issue_6467.rs diff --git a/tests/gpu-tests/regression/issue_6827.rs b/tests/tests/wgpu-gpu/regression/issue_6827.rs similarity index 100% rename from tests/gpu-tests/regression/issue_6827.rs rename to tests/tests/wgpu-gpu/regression/issue_6827.rs diff --git a/tests/gpu-tests/render_pass_ownership.rs b/tests/tests/wgpu-gpu/render_pass_ownership.rs similarity index 100% rename from tests/gpu-tests/render_pass_ownership.rs rename to tests/tests/wgpu-gpu/render_pass_ownership.rs diff --git a/tests/gpu-tests/resource_descriptor_accessor.rs b/tests/tests/wgpu-gpu/resource_descriptor_accessor.rs similarity index 100% rename from tests/gpu-tests/resource_descriptor_accessor.rs rename to tests/tests/wgpu-gpu/resource_descriptor_accessor.rs diff --git a/tests/gpu-tests/resource_error.rs b/tests/tests/wgpu-gpu/resource_error.rs similarity index 100% rename from tests/gpu-tests/resource_error.rs rename to tests/tests/wgpu-gpu/resource_error.rs diff --git a/tests/gpu-tests/samplers.rs b/tests/tests/wgpu-gpu/samplers.rs similarity index 100% rename from tests/gpu-tests/samplers.rs rename to tests/tests/wgpu-gpu/samplers.rs diff --git a/tests/gpu-tests/scissor_tests/mod.rs b/tests/tests/wgpu-gpu/scissor_tests/mod.rs similarity index 100% rename from tests/gpu-tests/scissor_tests/mod.rs rename to tests/tests/wgpu-gpu/scissor_tests/mod.rs diff --git a/tests/gpu-tests/scissor_tests/solid_white.wgsl b/tests/tests/wgpu-gpu/scissor_tests/solid_white.wgsl similarity index 100% rename from tests/gpu-tests/scissor_tests/solid_white.wgsl rename to tests/tests/wgpu-gpu/scissor_tests/solid_white.wgsl diff --git a/tests/gpu-tests/shader/array_size_overrides.rs b/tests/tests/wgpu-gpu/shader/array_size_overrides.rs similarity index 100% rename from tests/gpu-tests/shader/array_size_overrides.rs rename to tests/tests/wgpu-gpu/shader/array_size_overrides.rs diff --git a/tests/gpu-tests/shader/compilation_messages/error_shader.wgsl b/tests/tests/wgpu-gpu/shader/compilation_messages/error_shader.wgsl similarity index 100% rename from tests/gpu-tests/shader/compilation_messages/error_shader.wgsl rename to tests/tests/wgpu-gpu/shader/compilation_messages/error_shader.wgsl diff --git a/tests/gpu-tests/shader/compilation_messages/mod.rs b/tests/tests/wgpu-gpu/shader/compilation_messages/mod.rs similarity index 100% rename from tests/gpu-tests/shader/compilation_messages/mod.rs rename to tests/tests/wgpu-gpu/shader/compilation_messages/mod.rs diff --git a/tests/gpu-tests/shader/compilation_messages/successful_shader.wgsl b/tests/tests/wgpu-gpu/shader/compilation_messages/successful_shader.wgsl similarity index 100% rename from tests/gpu-tests/shader/compilation_messages/successful_shader.wgsl rename to tests/tests/wgpu-gpu/shader/compilation_messages/successful_shader.wgsl diff --git a/tests/gpu-tests/shader/data_builtins.rs b/tests/tests/wgpu-gpu/shader/data_builtins.rs similarity index 100% rename from tests/gpu-tests/shader/data_builtins.rs rename to tests/tests/wgpu-gpu/shader/data_builtins.rs diff --git a/tests/gpu-tests/shader/mod.rs b/tests/tests/wgpu-gpu/shader/mod.rs similarity index 100% rename from tests/gpu-tests/shader/mod.rs rename to tests/tests/wgpu-gpu/shader/mod.rs diff --git a/tests/gpu-tests/shader/numeric_builtins.rs b/tests/tests/wgpu-gpu/shader/numeric_builtins.rs similarity index 100% rename from tests/gpu-tests/shader/numeric_builtins.rs rename to tests/tests/wgpu-gpu/shader/numeric_builtins.rs diff --git a/tests/gpu-tests/shader/shader_test.wgsl b/tests/tests/wgpu-gpu/shader/shader_test.wgsl similarity index 100% rename from tests/gpu-tests/shader/shader_test.wgsl rename to tests/tests/wgpu-gpu/shader/shader_test.wgsl diff --git a/tests/gpu-tests/shader/struct_layout.rs b/tests/tests/wgpu-gpu/shader/struct_layout.rs similarity index 100% rename from tests/gpu-tests/shader/struct_layout.rs rename to tests/tests/wgpu-gpu/shader/struct_layout.rs diff --git a/tests/gpu-tests/shader/workgroup_size_overrides.rs b/tests/tests/wgpu-gpu/shader/workgroup_size_overrides.rs similarity index 100% rename from tests/gpu-tests/shader/workgroup_size_overrides.rs rename to tests/tests/wgpu-gpu/shader/workgroup_size_overrides.rs diff --git a/tests/gpu-tests/shader/zero_init_workgroup_mem.rs b/tests/tests/wgpu-gpu/shader/zero_init_workgroup_mem.rs similarity index 100% rename from tests/gpu-tests/shader/zero_init_workgroup_mem.rs rename to tests/tests/wgpu-gpu/shader/zero_init_workgroup_mem.rs diff --git a/tests/gpu-tests/shader/zero_init_workgroup_mem.wgsl b/tests/tests/wgpu-gpu/shader/zero_init_workgroup_mem.wgsl similarity index 100% rename from tests/gpu-tests/shader/zero_init_workgroup_mem.wgsl rename to tests/tests/wgpu-gpu/shader/zero_init_workgroup_mem.wgsl diff --git a/tests/gpu-tests/shader_primitive_index/mod.rs b/tests/tests/wgpu-gpu/shader_primitive_index/mod.rs similarity index 100% rename from tests/gpu-tests/shader_primitive_index/mod.rs rename to tests/tests/wgpu-gpu/shader_primitive_index/mod.rs diff --git a/tests/gpu-tests/shader_primitive_index/primitive_index.wgsl b/tests/tests/wgpu-gpu/shader_primitive_index/primitive_index.wgsl similarity index 100% rename from tests/gpu-tests/shader_primitive_index/primitive_index.wgsl rename to tests/tests/wgpu-gpu/shader_primitive_index/primitive_index.wgsl diff --git a/tests/gpu-tests/shader_view_format/mod.rs b/tests/tests/wgpu-gpu/shader_view_format/mod.rs similarity index 100% rename from tests/gpu-tests/shader_view_format/mod.rs rename to tests/tests/wgpu-gpu/shader_view_format/mod.rs diff --git a/tests/gpu-tests/shader_view_format/view_format.wgsl b/tests/tests/wgpu-gpu/shader_view_format/view_format.wgsl similarity index 100% rename from tests/gpu-tests/shader_view_format/view_format.wgsl rename to tests/tests/wgpu-gpu/shader_view_format/view_format.wgsl diff --git a/tests/gpu-tests/subgroup_operations/mod.rs b/tests/tests/wgpu-gpu/subgroup_operations/mod.rs similarity index 100% rename from tests/gpu-tests/subgroup_operations/mod.rs rename to tests/tests/wgpu-gpu/subgroup_operations/mod.rs diff --git a/tests/gpu-tests/subgroup_operations/shader.wgsl b/tests/tests/wgpu-gpu/subgroup_operations/shader.wgsl similarity index 100% rename from tests/gpu-tests/subgroup_operations/shader.wgsl rename to tests/tests/wgpu-gpu/subgroup_operations/shader.wgsl diff --git a/tests/gpu-tests/texture_binding/mod.rs b/tests/tests/wgpu-gpu/texture_binding/mod.rs similarity index 100% rename from tests/gpu-tests/texture_binding/mod.rs rename to tests/tests/wgpu-gpu/texture_binding/mod.rs diff --git a/tests/gpu-tests/texture_binding/shader.wgsl b/tests/tests/wgpu-gpu/texture_binding/shader.wgsl similarity index 100% rename from tests/gpu-tests/texture_binding/shader.wgsl rename to tests/tests/wgpu-gpu/texture_binding/shader.wgsl diff --git a/tests/gpu-tests/texture_binding/single_scalar.wgsl b/tests/tests/wgpu-gpu/texture_binding/single_scalar.wgsl similarity index 100% rename from tests/gpu-tests/texture_binding/single_scalar.wgsl rename to tests/tests/wgpu-gpu/texture_binding/single_scalar.wgsl diff --git a/tests/gpu-tests/texture_blit.rs b/tests/tests/wgpu-gpu/texture_blit.rs similarity index 100% rename from tests/gpu-tests/texture_blit.rs rename to tests/tests/wgpu-gpu/texture_blit.rs diff --git a/tests/gpu-tests/texture_bounds.rs b/tests/tests/wgpu-gpu/texture_bounds.rs similarity index 100% rename from tests/gpu-tests/texture_bounds.rs rename to tests/tests/wgpu-gpu/texture_bounds.rs diff --git a/tests/gpu-tests/texture_view_creation.rs b/tests/tests/wgpu-gpu/texture_view_creation.rs similarity index 100% rename from tests/gpu-tests/texture_view_creation.rs rename to tests/tests/wgpu-gpu/texture_view_creation.rs diff --git a/tests/gpu-tests/transfer.rs b/tests/tests/wgpu-gpu/transfer.rs similarity index 100% rename from tests/gpu-tests/transfer.rs rename to tests/tests/wgpu-gpu/transfer.rs diff --git a/tests/gpu-tests/transition_resources.rs b/tests/tests/wgpu-gpu/transition_resources.rs similarity index 100% rename from tests/gpu-tests/transition_resources.rs rename to tests/tests/wgpu-gpu/transition_resources.rs diff --git a/tests/gpu-tests/vertex_formats/draw.vert.wgsl b/tests/tests/wgpu-gpu/vertex_formats/draw.vert.wgsl similarity index 100% rename from tests/gpu-tests/vertex_formats/draw.vert.wgsl rename to tests/tests/wgpu-gpu/vertex_formats/draw.vert.wgsl diff --git a/tests/gpu-tests/vertex_formats/mod.rs b/tests/tests/wgpu-gpu/vertex_formats/mod.rs similarity index 100% rename from tests/gpu-tests/vertex_formats/mod.rs rename to tests/tests/wgpu-gpu/vertex_formats/mod.rs diff --git a/tests/gpu-tests/vertex_indices/draw.vert.wgsl b/tests/tests/wgpu-gpu/vertex_indices/draw.vert.wgsl similarity index 100% rename from tests/gpu-tests/vertex_indices/draw.vert.wgsl rename to tests/tests/wgpu-gpu/vertex_indices/draw.vert.wgsl diff --git a/tests/gpu-tests/vertex_indices/mod.rs b/tests/tests/wgpu-gpu/vertex_indices/mod.rs similarity index 100% rename from tests/gpu-tests/vertex_indices/mod.rs rename to tests/tests/wgpu-gpu/vertex_indices/mod.rs diff --git a/tests/gpu-tests/write_texture.rs b/tests/tests/wgpu-gpu/write_texture.rs similarity index 100% rename from tests/gpu-tests/write_texture.rs rename to tests/tests/wgpu-gpu/write_texture.rs diff --git a/tests/gpu-tests/zero_init_texture_after_discard.rs b/tests/tests/wgpu-gpu/zero_init_texture_after_discard.rs similarity index 100% rename from tests/gpu-tests/zero_init_texture_after_discard.rs rename to tests/tests/wgpu-gpu/zero_init_texture_after_discard.rs diff --git a/tests/validation-tests/api/binding_arrays.rs b/tests/tests/wgpu-validation/api/binding_arrays.rs similarity index 100% rename from tests/validation-tests/api/binding_arrays.rs rename to tests/tests/wgpu-validation/api/binding_arrays.rs diff --git a/tests/validation-tests/api/buffer.rs b/tests/tests/wgpu-validation/api/buffer.rs similarity index 100% rename from tests/validation-tests/api/buffer.rs rename to tests/tests/wgpu-validation/api/buffer.rs diff --git a/tests/validation-tests/api/buffer_slice.rs b/tests/tests/wgpu-validation/api/buffer_slice.rs similarity index 100% rename from tests/validation-tests/api/buffer_slice.rs rename to tests/tests/wgpu-validation/api/buffer_slice.rs diff --git a/tests/validation-tests/api/instance.rs b/tests/tests/wgpu-validation/api/instance.rs similarity index 100% rename from tests/validation-tests/api/instance.rs rename to tests/tests/wgpu-validation/api/instance.rs diff --git a/tests/validation-tests/api/mod.rs b/tests/tests/wgpu-validation/api/mod.rs similarity index 100% rename from tests/validation-tests/api/mod.rs rename to tests/tests/wgpu-validation/api/mod.rs diff --git a/tests/validation-tests/api/texture.rs b/tests/tests/wgpu-validation/api/texture.rs similarity index 100% rename from tests/validation-tests/api/texture.rs rename to tests/tests/wgpu-validation/api/texture.rs diff --git a/tests/validation-tests/root.rs b/tests/tests/wgpu-validation/main.rs similarity index 100% rename from tests/validation-tests/root.rs rename to tests/tests/wgpu-validation/main.rs diff --git a/tests/validation-tests/noop.rs b/tests/tests/wgpu-validation/noop.rs similarity index 100% rename from tests/validation-tests/noop.rs rename to tests/tests/wgpu-validation/noop.rs