[tint] Use consistent file pattern for test files
Always append with _test.* for files to be used in tests.
Change-Id: Ide629f6974afeca5c30227c5808cd97d2ee75585
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/143402
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index 3ac3dda..60e8ad2 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -1566,8 +1566,8 @@
tint_unittests_source_set("libtint_unittests_ast_helper") {
sources = [
- "lang/wgsl/ast/test_helper.h",
- "lang/wgsl/ast/test_helper_test.cc",
+ "lang/wgsl/ast/helper_test.cc",
+ "lang/wgsl/ast/helper_test.h",
]
deps = [ ":libtint_ast_src" ]
}
@@ -1678,11 +1678,11 @@
tint_unittests_source_set("tint_unittests_inspector_src") {
sources = [
+ "lang/wgsl/inspector/inspector_builder_test.cc",
+ "lang/wgsl/inspector/inspector_builder_test.h",
+ "lang/wgsl/inspector/inspector_runner_test.cc",
+ "lang/wgsl/inspector/inspector_runner_test.h",
"lang/wgsl/inspector/inspector_test.cc",
- "lang/wgsl/inspector/test_inspector_builder.cc",
- "lang/wgsl/inspector/test_inspector_builder.h",
- "lang/wgsl/inspector/test_inspector_runner.cc",
- "lang/wgsl/inspector/test_inspector_runner.h",
]
deps = [ ":libtint_inspector_src" ]
}
@@ -1739,9 +1739,9 @@
"lang/wgsl/resolver/ptr_ref_test.cc",
"lang/wgsl/resolver/ptr_ref_validation_test.cc",
"lang/wgsl/resolver/resolver_behavior_test.cc",
+ "lang/wgsl/resolver/resolver_helper_test.cc",
+ "lang/wgsl/resolver/resolver_helper_test.h",
"lang/wgsl/resolver/resolver_test.cc",
- "lang/wgsl/resolver/resolver_test_helper.cc",
- "lang/wgsl/resolver/resolver_test_helper.h",
"lang/wgsl/resolver/root_identifier_test.cc",
"lang/wgsl/resolver/side_effects_test.cc",
"lang/wgsl/resolver/struct_address_space_use_test.cc",
@@ -1832,6 +1832,7 @@
"lang/wgsl/ast/transform/fold_trivial_lets_test.cc",
"lang/wgsl/ast/transform/for_loop_to_loop_test.cc",
"lang/wgsl/ast/transform/get_insertion_point_test.cc",
+ "lang/wgsl/ast/transform/helper_test.h",
"lang/wgsl/ast/transform/hoist_to_decl_before_test.cc",
"lang/wgsl/ast/transform/localize_struct_array_assignment_test.cc",
"lang/wgsl/ast/transform/manager_test.cc",
@@ -1857,7 +1858,6 @@
"lang/wgsl/ast/transform/std140_f32_test.cc",
"lang/wgsl/ast/transform/std140_test.cc",
"lang/wgsl/ast/transform/substitute_override_test.cc",
- "lang/wgsl/ast/transform/test_helper.h",
"lang/wgsl/ast/transform/texture_1d_to_2d_test.cc",
"lang/wgsl/ast/transform/transform_test.cc",
"lang/wgsl/ast/transform/truncate_interstage_variables_test.cc",
@@ -1887,7 +1887,7 @@
"lang/core/ir/transform/add_empty_entry_point_test.cc",
"lang/core/ir/transform/block_decorated_structs_test.cc",
"lang/core/ir/transform/demote_to_helper_test.cc",
- "lang/core/ir/transform/test_helper.h",
+ "lang/core/ir/transform/helper_test.h",
]
deps = [
@@ -1994,6 +1994,8 @@
"lang/spirv/reader/ast_parser/function_var_test.cc",
"lang/spirv/reader/ast_parser/get_decorations_test.cc",
"lang/spirv/reader/ast_parser/handle_test.cc",
+ "lang/spirv/reader/ast_parser/helper_test.cc",
+ "lang/spirv/reader/ast_parser/helper_test.h",
"lang/spirv/reader/ast_parser/import_test.cc",
"lang/spirv/reader/ast_parser/module_function_decl_test.cc",
"lang/spirv/reader/ast_parser/module_var_test.cc",
@@ -2001,8 +2003,6 @@
"lang/spirv/reader/ast_parser/namer_test.cc",
"lang/spirv/reader/ast_parser/spirv_tools_helpers_test.cc",
"lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h",
- "lang/spirv/reader/ast_parser/test_helper.cc",
- "lang/spirv/reader/ast_parser/test_helper.h",
"lang/spirv/reader/ast_parser/type_test.cc",
"lang/spirv/reader/ast_parser/usage_test.cc",
"lang/spirv/reader/ast_parser/user_name_test.cc",
@@ -2040,11 +2040,11 @@
"lang/spirv/writer/ast_printer/function_attribute_test.cc",
"lang/spirv/writer/ast_printer/function_variable_test.cc",
"lang/spirv/writer/ast_printer/global_variable_test.cc",
+ "lang/spirv/writer/ast_printer/helper_test.h",
"lang/spirv/writer/ast_printer/ident_expression_test.cc",
"lang/spirv/writer/ast_printer/literal_test.cc",
"lang/spirv/writer/ast_printer/return_test.cc",
"lang/spirv/writer/ast_printer/scalar_constant_test.cc",
- "lang/spirv/writer/ast_printer/test_helper.h",
"lang/spirv/writer/ast_printer/unary_op_expression_test.cc",
"lang/spirv/writer/common/binary_writer_test.cc",
"lang/spirv/writer/common/instruction_test.cc",
@@ -2069,7 +2069,7 @@
"lang/spirv/writer/binary_test.cc",
"lang/spirv/writer/bitcast_test.cc",
"lang/spirv/writer/builtin_test.cc",
- "lang/spirv/writer/common/test_helper.h",
+ "lang/spirv/writer/common/helper_test.h",
"lang/spirv/writer/constant_test.cc",
"lang/spirv/writer/construct_test.cc",
"lang/spirv/writer/convert_test.cc",
@@ -2120,6 +2120,8 @@
"lang/wgsl/reader/parser/global_constant_decl_test.cc",
"lang/wgsl/reader/parser/global_decl_test.cc",
"lang/wgsl/reader/parser/global_variable_decl_test.cc",
+ "lang/wgsl/reader/parser/helper_test.cc",
+ "lang/wgsl/reader/parser/helper_test.h",
"lang/wgsl/reader/parser/if_stmt_test.cc",
"lang/wgsl/reader/parser/increment_decrement_stmt_test.cc",
"lang/wgsl/reader/parser/lexer_test.cc",
@@ -2146,8 +2148,6 @@
"lang/wgsl/reader/parser/struct_member_test.cc",
"lang/wgsl/reader/parser/switch_body_test.cc",
"lang/wgsl/reader/parser/switch_stmt_test.cc",
- "lang/wgsl/reader/parser/test_helper.cc",
- "lang/wgsl/reader/parser/test_helper.h",
"lang/wgsl/reader/parser/token_test.cc",
"lang/wgsl/reader/parser/type_alias_test.cc",
"lang/wgsl/reader/parser/type_decl_test.cc",
@@ -2250,6 +2250,7 @@
"lang/wgsl/writer/ast_printer/enable_test.cc",
"lang/wgsl/writer/ast_printer/function_test.cc",
"lang/wgsl/writer/ast_printer/global_decl_test.cc",
+ "lang/wgsl/writer/ast_printer/helper_test.h",
"lang/wgsl/writer/ast_printer/identifier_test.cc",
"lang/wgsl/writer/ast_printer/if_test.cc",
"lang/wgsl/writer/ast_printer/literal_test.cc",
@@ -2257,7 +2258,6 @@
"lang/wgsl/writer/ast_printer/member_accessor_test.cc",
"lang/wgsl/writer/ast_printer/return_test.cc",
"lang/wgsl/writer/ast_printer/switch_test.cc",
- "lang/wgsl/writer/ast_printer/test_helper.h",
"lang/wgsl/writer/ast_printer/type_test.cc",
"lang/wgsl/writer/ast_printer/unary_op_test.cc",
"lang/wgsl/writer/ast_printer/variable_decl_statement_test.cc",
@@ -2292,6 +2292,7 @@
"lang/msl/writer/ast_printer/constructor_test.cc",
"lang/msl/writer/ast_printer/continue_test.cc",
"lang/msl/writer/ast_printer/discard_test.cc",
+ "lang/msl/writer/ast_printer/helper_test.h",
"lang/msl/writer/ast_printer/identifier_test.cc",
"lang/msl/writer/ast_printer/if_test.cc",
"lang/msl/writer/ast_printer/import_test.cc",
@@ -2301,7 +2302,6 @@
"lang/msl/writer/ast_printer/return_test.cc",
"lang/msl/writer/ast_printer/sanitizer_test.cc",
"lang/msl/writer/ast_printer/switch_test.cc",
- "lang/msl/writer/ast_printer/test_helper.h",
"lang/msl/writer/ast_printer/unary_op_test.cc",
"lang/msl/writer/ast_printer/variable_decl_statement_test.cc",
"lang/msl/writer/common/printer_support_test.cc",
@@ -2327,7 +2327,7 @@
sources += [
"lang/msl/writer/printer/constant_test.cc",
"lang/msl/writer/printer/function_test.cc",
- "lang/msl/writer/printer/test_helper.h",
+ "lang/msl/writer/printer/helper_test.h",
"lang/msl/writer/printer/type_test.cc",
]
deps += [
@@ -2358,6 +2358,7 @@
"lang/hlsl/writer/ast_printer/continue_test.cc",
"lang/hlsl/writer/ast_printer/discard_test.cc",
"lang/hlsl/writer/ast_printer/function_test.cc",
+ "lang/hlsl/writer/ast_printer/helper_test.h",
"lang/hlsl/writer/ast_printer/identifier_test.cc",
"lang/hlsl/writer/ast_printer/if_test.cc",
"lang/hlsl/writer/ast_printer/import_test.cc",
@@ -2367,7 +2368,6 @@
"lang/hlsl/writer/ast_printer/return_test.cc",
"lang/hlsl/writer/ast_printer/sanitizer_test.cc",
"lang/hlsl/writer/ast_printer/switch_test.cc",
- "lang/hlsl/writer/ast_printer/test_helper.h",
"lang/hlsl/writer/ast_printer/type_test.cc",
"lang/hlsl/writer/ast_printer/unary_op_test.cc",
"lang/hlsl/writer/ast_printer/variable_decl_statement_test.cc",
@@ -2401,6 +2401,7 @@
"lang/glsl/writer/ast_printer/continue_test.cc",
"lang/glsl/writer/ast_printer/discard_test.cc",
"lang/glsl/writer/ast_printer/function_test.cc",
+ "lang/glsl/writer/ast_printer/helper_test.h",
"lang/glsl/writer/ast_printer/identifier_test.cc",
"lang/glsl/writer/ast_printer/if_test.cc",
"lang/glsl/writer/ast_printer/import_test.cc",
@@ -2411,7 +2412,6 @@
"lang/glsl/writer/ast_printer/sanitizer_test.cc",
"lang/glsl/writer/ast_printer/storage_buffer_test.cc",
"lang/glsl/writer/ast_printer/switch_test.cc",
- "lang/glsl/writer/ast_printer/test_helper.h",
"lang/glsl/writer/ast_printer/type_test.cc",
"lang/glsl/writer/ast_printer/unary_op_test.cc",
"lang/glsl/writer/ast_printer/uniform_buffer_test.cc",
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt
index f5dfa00..84e30c8 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -1023,6 +1023,8 @@
lang/wgsl/ast/for_loop_statement_test.cc
lang/wgsl/ast/function_test.cc
lang/wgsl/ast/group_attribute_test.cc
+ lang/wgsl/ast/helper_test.h
+ lang/wgsl/ast/helper_test.cc
lang/wgsl/ast/id_attribute_test.cc
lang/wgsl/ast/identifier_expression_test.cc
lang/wgsl/ast/identifier_test.cc
@@ -1047,8 +1049,6 @@
lang/wgsl/ast/struct_test.cc
lang/wgsl/ast/switch_statement_test.cc
lang/wgsl/ast/templated_identifier_test.cc
- lang/wgsl/ast/test_helper.h
- lang/wgsl/ast/test_helper_test.cc
lang/wgsl/ast/transform/manager_test.cc
lang/wgsl/ast/transform/transform_test.cc
lang/wgsl/ast/traverse_expressions_test.cc
@@ -1117,9 +1117,9 @@
lang/wgsl/resolver/ptr_ref_test.cc
lang/wgsl/resolver/ptr_ref_validation_test.cc
lang/wgsl/resolver/resolver_behavior_test.cc
+ lang/wgsl/resolver/resolver_helper_test.cc
+ lang/wgsl/resolver/resolver_helper_test.h
lang/wgsl/resolver/resolver_test.cc
- lang/wgsl/resolver/resolver_test_helper.cc
- lang/wgsl/resolver/resolver_test_helper.h
lang/wgsl/resolver/root_identifier_test.cc
lang/wgsl/resolver/side_effects_test.cc
lang/wgsl/resolver/struct_address_space_use_test.cc
@@ -1193,11 +1193,11 @@
# Inspector tests depend on WGSL reader
if(${TINT_BUILD_WGSL_READER})
list(APPEND TINT_TEST_SRCS
+ lang/wgsl/inspector/inspector_builder_test.cc
+ lang/wgsl/inspector/inspector_builder_test.h
+ lang/wgsl/inspector/inspector_runner_test.cc
+ lang/wgsl/inspector/inspector_runner_test.h
lang/wgsl/inspector/inspector_test.cc
- lang/wgsl/inspector/test_inspector_builder.cc
- lang/wgsl/inspector/test_inspector_builder.h
- lang/wgsl/inspector/test_inspector_runner.cc
- lang/wgsl/inspector/test_inspector_runner.h
)
endif()
@@ -1225,6 +1225,8 @@
lang/spirv/reader/ast_parser/function_var_test.cc
lang/spirv/reader/ast_parser/get_decorations_test.cc
lang/spirv/reader/ast_parser/handle_test.cc
+ lang/spirv/reader/ast_parser/helper_test.cc
+ lang/spirv/reader/ast_parser/helper_test.h
lang/spirv/reader/ast_parser/import_test.cc
lang/spirv/reader/ast_parser/module_var_test.cc
lang/spirv/reader/ast_parser/named_types_test.cc
@@ -1232,8 +1234,6 @@
lang/spirv/reader/ast_parser/parser_test.cc
lang/spirv/reader/ast_parser/spirv_tools_helpers_test.cc
lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h
- lang/spirv/reader/ast_parser/test_helper.cc
- lang/spirv/reader/ast_parser/test_helper.h
lang/spirv/reader/ast_parser/type_test.cc
lang/spirv/reader/ast_parser/usage_test.cc
lang/spirv/reader/ast_parser/user_name_test.cc
@@ -1277,6 +1277,8 @@
lang/wgsl/reader/parser/global_constant_decl_test.cc
lang/wgsl/reader/parser/global_decl_test.cc
lang/wgsl/reader/parser/global_variable_decl_test.cc
+ lang/wgsl/reader/parser/helper_test.cc
+ lang/wgsl/reader/parser/helper_test.h
lang/wgsl/reader/parser/if_stmt_test.cc
lang/wgsl/reader/parser/increment_decrement_stmt_test.cc
lang/wgsl/reader/parser/lexer_test.cc
@@ -1303,8 +1305,6 @@
lang/wgsl/reader/parser/struct_member_test.cc
lang/wgsl/reader/parser/switch_body_test.cc
lang/wgsl/reader/parser/switch_stmt_test.cc
- lang/wgsl/reader/parser/test_helper.cc
- lang/wgsl/reader/parser/test_helper.h
lang/wgsl/reader/parser/token_test.cc
lang/wgsl/reader/parser/type_alias_test.cc
lang/wgsl/reader/parser/type_decl_test.cc
@@ -1361,11 +1361,11 @@
lang/spirv/writer/ast_printer/function_attribute_test.cc
lang/spirv/writer/ast_printer/function_variable_test.cc
lang/spirv/writer/ast_printer/global_variable_test.cc
+ lang/spirv/writer/ast_printer/helper_test.h
lang/spirv/writer/ast_printer/ident_expression_test.cc
lang/spirv/writer/ast_printer/literal_test.cc
lang/spirv/writer/ast_printer/return_test.cc
lang/spirv/writer/ast_printer/scalar_constant_test.cc
- lang/spirv/writer/ast_printer/test_helper.h
lang/spirv/writer/ast_printer/unary_op_expression_test.cc
lang/spirv/writer/common/binary_writer_test.cc
lang/spirv/writer/common/instruction_test.cc
@@ -1389,7 +1389,7 @@
lang/spirv/writer/binary_test.cc
lang/spirv/writer/bitcast_test.cc
lang/spirv/writer/builtin_test.cc
- lang/spirv/writer/common/test_helper.h
+ lang/spirv/writer/common/helper_test.h
lang/spirv/writer/constant_test.cc
lang/spirv/writer/construct_test.cc
lang/spirv/writer/convert_test.cc
@@ -1430,6 +1430,7 @@
lang/wgsl/writer/ast_printer/enable_test.cc
lang/wgsl/writer/ast_printer/function_test.cc
lang/wgsl/writer/ast_printer/global_decl_test.cc
+ lang/wgsl/writer/ast_printer/helper_test.h
lang/wgsl/writer/ast_printer/identifier_test.cc
lang/wgsl/writer/ast_printer/if_test.cc
lang/wgsl/writer/ast_printer/loop_test.cc
@@ -1441,7 +1442,6 @@
lang/wgsl/writer/ast_printer/unary_op_test.cc
lang/wgsl/writer/ast_printer/variable_decl_statement_test.cc
lang/wgsl/writer/ast_printer/variable_test.cc
- lang/wgsl/writer/ast_printer/test_helper.h
)
if (${TINT_BUILD_IR})
@@ -1479,6 +1479,7 @@
lang/wgsl/ast/transform/fold_trivial_lets_test.cc
lang/wgsl/ast/transform/for_loop_to_loop_test.cc
lang/wgsl/ast/transform/get_insertion_point_test.cc
+ lang/wgsl/ast/transform/helper_test.h
lang/wgsl/ast/transform/hoist_to_decl_before_test.cc
lang/wgsl/ast/transform/localize_struct_array_assignment_test.cc
lang/wgsl/ast/transform/merge_return_test.cc
@@ -1503,7 +1504,6 @@
lang/wgsl/ast/transform/std140_f32_test.cc
lang/wgsl/ast/transform/std140_test.cc
lang/wgsl/ast/transform/substitute_override_test.cc
- lang/wgsl/ast/transform/test_helper.h
lang/wgsl/ast/transform/texture_1d_to_2d_test.cc
lang/wgsl/ast/transform/truncate_interstage_variables_test.cc
lang/wgsl/ast/transform/unshadow_test.cc
@@ -1536,6 +1536,7 @@
lang/msl/writer/ast_printer/constructor_test.cc
lang/msl/writer/ast_printer/continue_test.cc
lang/msl/writer/ast_printer/discard_test.cc
+ lang/msl/writer/ast_printer/helper_test.h
lang/msl/writer/ast_printer/identifier_test.cc
lang/msl/writer/ast_printer/if_test.cc
lang/msl/writer/ast_printer/import_test.cc
@@ -1545,7 +1546,6 @@
lang/msl/writer/ast_printer/return_test.cc
lang/msl/writer/ast_printer/sanitizer_test.cc
lang/msl/writer/ast_printer/switch_test.cc
- lang/msl/writer/ast_printer/test_helper.h
lang/msl/writer/ast_printer/unary_op_test.cc
lang/msl/writer/ast_printer/variable_decl_statement_test.cc
lang/msl/writer/common/printer_support_test.cc
@@ -1555,8 +1555,8 @@
list(APPEND TINT_TEST_SRCS
lang/msl/writer/printer/constant_test.cc
lang/msl/writer/printer/function_test.cc
+ lang/msl/writer/printer/helper_test.h
lang/msl/writer/printer/type_test.cc
- lang/msl/writer/printer/test_helper.h
)
endif()
endif()
@@ -1579,6 +1579,7 @@
lang/glsl/writer/ast_printer/continue_test.cc
lang/glsl/writer/ast_printer/discard_test.cc
lang/glsl/writer/ast_printer/function_test.cc
+ lang/glsl/writer/ast_printer/helper_test.h
lang/glsl/writer/ast_printer/identifier_test.cc
lang/glsl/writer/ast_printer/if_test.cc
lang/glsl/writer/ast_printer/import_test.cc
@@ -1594,7 +1595,6 @@
lang/glsl/writer/ast_printer/uniform_buffer_test.cc
lang/glsl/writer/ast_printer/variable_decl_statement_test.cc
lang/glsl/writer/ast_printer/workgroup_var_test.cc
- lang/glsl/writer/ast_printer/test_helper.h
)
endif()
@@ -1617,6 +1617,7 @@
lang/hlsl/writer/ast_printer/continue_test.cc
lang/hlsl/writer/ast_printer/discard_test.cc
lang/hlsl/writer/ast_printer/function_test.cc
+ lang/hlsl/writer/ast_printer/helper_test.h
lang/hlsl/writer/ast_printer/identifier_test.cc
lang/hlsl/writer/ast_printer/if_test.cc
lang/hlsl/writer/ast_printer/import_test.cc
@@ -1630,7 +1631,6 @@
lang/hlsl/writer/ast_printer/unary_op_test.cc
lang/hlsl/writer/ast_printer/variable_decl_statement_test.cc
lang/hlsl/writer/ast_printer/workgroup_var_test.cc
- lang/hlsl/writer/ast_printer/test_helper.h
)
endif()
diff --git a/src/tint/lang/core/constant/composite_test.cc b/src/tint/lang/core/constant/composite_test.cc
index 81ddf51..18a8f45 100644
--- a/src/tint/lang/core/constant/composite_test.cc
+++ b/src/tint/lang/core/constant/composite_test.cc
@@ -14,8 +14,8 @@
#include "src/tint/lang/core/constant/composite.h"
+#include "src/tint/lang/core/constant/helper_test.h"
#include "src/tint/lang/core/constant/scalar.h"
-#include "src/tint/lang/core/constant/test_helper.h"
namespace tint::constant {
namespace {
diff --git a/src/tint/lang/core/constant/test_helper.h b/src/tint/lang/core/constant/helper_test.h
similarity index 87%
rename from src/tint/lang/core/constant/test_helper.h
rename to src/tint/lang/core/constant/helper_test.h
index d8044e8..de6c27f 100644
--- a/src/tint/lang/core/constant/test_helper.h
+++ b/src/tint/lang/core/constant/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_CORE_CONSTANT_TEST_HELPER_H_
-#define SRC_TINT_LANG_CORE_CONSTANT_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_CORE_CONSTANT_HELPER_TEST_H_
+#define SRC_TINT_LANG_CORE_CONSTANT_HELPER_TEST_H_
#include "gtest/gtest.h"
#include "src/tint/lang/wgsl/program/program_builder.h"
@@ -33,4 +33,4 @@
} // namespace tint::constant
-#endif // SRC_TINT_LANG_CORE_CONSTANT_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_CORE_CONSTANT_HELPER_TEST_H_
diff --git a/src/tint/lang/core/constant/scalar_test.cc b/src/tint/lang/core/constant/scalar_test.cc
index cdd7c9a..6bed5a5 100644
--- a/src/tint/lang/core/constant/scalar_test.cc
+++ b/src/tint/lang/core/constant/scalar_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/constant/scalar.h"
-#include "src/tint/lang/core/constant/test_helper.h"
+#include "src/tint/lang/core/constant/helper_test.h"
namespace tint::constant {
namespace {
diff --git a/src/tint/lang/core/constant/splat_test.cc b/src/tint/lang/core/constant/splat_test.cc
index e77efc4..6f42fac 100644
--- a/src/tint/lang/core/constant/splat_test.cc
+++ b/src/tint/lang/core/constant/splat_test.cc
@@ -14,8 +14,8 @@
#include "src/tint/lang/core/constant/splat.h"
+#include "src/tint/lang/core/constant/helper_test.h"
#include "src/tint/lang/core/constant/scalar.h"
-#include "src/tint/lang/core/constant/test_helper.h"
namespace tint::constant {
namespace {
diff --git a/src/tint/lang/core/constant/value_test.cc b/src/tint/lang/core/constant/value_test.cc
index 8868685..d18279b 100644
--- a/src/tint/lang/core/constant/value_test.cc
+++ b/src/tint/lang/core/constant/value_test.cc
@@ -14,8 +14,8 @@
#include "src/tint/lang/core/constant/splat.h"
+#include "src/tint/lang/core/constant/helper_test.h"
#include "src/tint/lang/core/constant/scalar.h"
-#include "src/tint/lang/core/constant/test_helper.h"
namespace tint::constant {
namespace {
diff --git a/src/tint/lang/core/ir/access_test.cc b/src/tint/lang/core/ir/access_test.cc
index 20bb037..b218e7c 100644
--- a/src/tint/lang/core/ir/access_test.cc
+++ b/src/tint/lang/core/ir/access_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
using namespace tint::builtin::fluent_types; // NOLINT
diff --git a/src/tint/lang/core/ir/binary_test.cc b/src/tint/lang/core/ir/binary_test.cc
index 537274e..449cd30 100644
--- a/src/tint/lang/core/ir/binary_test.cc
+++ b/src/tint/lang/core/ir/binary_test.cc
@@ -16,7 +16,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/builder.h"
#include "src/tint/lang/core/ir/instruction.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/bitcast_test.cc b/src/tint/lang/core/ir/bitcast_test.cc
index 69e959b..37c7732 100644
--- a/src/tint/lang/core/ir/bitcast_test.cc
+++ b/src/tint/lang/core/ir/bitcast_test.cc
@@ -17,7 +17,7 @@
#include "src/tint/lang/core/ir/builder.h"
#include "src/tint/lang/core/ir/constant.h"
#include "src/tint/lang/core/ir/instruction.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/block_param_test.cc b/src/tint/lang/core/ir/block_param_test.cc
index 7096143..fa92414 100644
--- a/src/tint/lang/core/ir/block_param_test.cc
+++ b/src/tint/lang/core/ir/block_param_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/ir/block_param.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/block_test.cc b/src/tint/lang/core/ir/block_test.cc
index 99f114d..b1b5305 100644
--- a/src/tint/lang/core/ir/block_test.cc
+++ b/src/tint/lang/core/ir/block_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/ir/block.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/break_if_test.cc b/src/tint/lang/core/ir/break_if_test.cc
index 751c377..992585d 100644
--- a/src/tint/lang/core/ir/break_if_test.cc
+++ b/src/tint/lang/core/ir/break_if_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/constant_test.cc b/src/tint/lang/core/ir/constant_test.cc
index 14407a0..342e14a 100644
--- a/src/tint/lang/core/ir/constant_test.cc
+++ b/src/tint/lang/core/ir/constant_test.cc
@@ -14,7 +14,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/builder.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
#include "src/tint/lang/core/ir/value.h"
namespace tint::ir {
diff --git a/src/tint/lang/core/ir/construct_test.cc b/src/tint/lang/core/ir/construct_test.cc
index 81b8728..727db00 100644
--- a/src/tint/lang/core/ir/construct_test.cc
+++ b/src/tint/lang/core/ir/construct_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/continue_test.cc b/src/tint/lang/core/ir/continue_test.cc
index e4778d0..1607195 100644
--- a/src/tint/lang/core/ir/continue_test.cc
+++ b/src/tint/lang/core/ir/continue_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/convert_test.cc b/src/tint/lang/core/ir/convert_test.cc
index 3a5419e..35b9804 100644
--- a/src/tint/lang/core/ir/convert_test.cc
+++ b/src/tint/lang/core/ir/convert_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/ir/convert.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/core_builtin_call_test.cc b/src/tint/lang/core/ir/core_builtin_call_test.cc
index b46fc7f..02aff19 100644
--- a/src/tint/lang/core/ir/core_builtin_call_test.cc
+++ b/src/tint/lang/core/ir/core_builtin_call_test.cc
@@ -15,7 +15,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/block_param.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/discard_test.cc b/src/tint/lang/core/ir/discard_test.cc
index 341a096..6ad2615 100644
--- a/src/tint/lang/core/ir/discard_test.cc
+++ b/src/tint/lang/core/ir/discard_test.cc
@@ -15,7 +15,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/builder.h"
#include "src/tint/lang/core/ir/instruction.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/exit_if_test.cc b/src/tint/lang/core/ir/exit_if_test.cc
index 4610695..59389f1 100644
--- a/src/tint/lang/core/ir/exit_if_test.cc
+++ b/src/tint/lang/core/ir/exit_if_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/core/ir/exit_if.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/exit_loop_test.cc b/src/tint/lang/core/ir/exit_loop_test.cc
index bd54e14..8fb617a 100644
--- a/src/tint/lang/core/ir/exit_loop_test.cc
+++ b/src/tint/lang/core/ir/exit_loop_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/core/ir/exit_loop.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/exit_switch_test.cc b/src/tint/lang/core/ir/exit_switch_test.cc
index a2d3b97..61fb75d 100644
--- a/src/tint/lang/core/ir/exit_switch_test.cc
+++ b/src/tint/lang/core/ir/exit_switch_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/core/ir/exit_switch.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/function_param_test.cc b/src/tint/lang/core/ir/function_param_test.cc
index d7716cf..36e3234 100644
--- a/src/tint/lang/core/ir/function_param_test.cc
+++ b/src/tint/lang/core/ir/function_param_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/ir/function_param.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/function_test.cc b/src/tint/lang/core/ir/function_test.cc
index 33a13bb..31890e1 100644
--- a/src/tint/lang/core/ir/function_test.cc
+++ b/src/tint/lang/core/ir/function_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/ir/function.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/if_test.cc b/src/tint/lang/core/ir/if_test.cc
index 33ce48f..c554c9d 100644
--- a/src/tint/lang/core/ir/if_test.cc
+++ b/src/tint/lang/core/ir/if_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/core/ir/if.h"
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/instruction_result_test.cc b/src/tint/lang/core/ir/instruction_result_test.cc
index 923d5fd..11913eb 100644
--- a/src/tint/lang/core/ir/instruction_result_test.cc
+++ b/src/tint/lang/core/ir/instruction_result_test.cc
@@ -14,7 +14,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
using namespace tint::number_suffixes; // NOLINT
using namespace tint::builtin::fluent_types; // NOLINT
diff --git a/src/tint/lang/core/ir/instruction_test.cc b/src/tint/lang/core/ir/instruction_test.cc
index a6ca823..8b6ca77 100644
--- a/src/tint/lang/core/ir/instruction_test.cc
+++ b/src/tint/lang/core/ir/instruction_test.cc
@@ -15,7 +15,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/block.h"
#include "src/tint/lang/core/ir/builder.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
#include "src/tint/lang/core/ir/module.h"
namespace tint::ir {
diff --git a/src/tint/lang/core/ir/intrinsic_call_test.cc b/src/tint/lang/core/ir/intrinsic_call_test.cc
index f728831..ecb2bd9 100644
--- a/src/tint/lang/core/ir/intrinsic_call_test.cc
+++ b/src/tint/lang/core/ir/intrinsic_call_test.cc
@@ -14,7 +14,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/ir_test_helper.h b/src/tint/lang/core/ir/ir_helper_test.h
similarity index 89%
rename from src/tint/lang/core/ir/ir_test_helper.h
rename to src/tint/lang/core/ir/ir_helper_test.h
index cba1020..bb62518 100644
--- a/src/tint/lang/core/ir/ir_test_helper.h
+++ b/src/tint/lang/core/ir/ir_helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_CORE_IR_IR_TEST_HELPER_H_
-#define SRC_TINT_LANG_CORE_IR_IR_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_CORE_IR_IR_HELPER_TEST_H_
+#define SRC_TINT_LANG_CORE_IR_IR_HELPER_TEST_H_
#include "gtest/gtest.h"
#include "src/tint/lang/core/ir/builder.h"
@@ -43,4 +43,4 @@
} // namespace tint::ir
-#endif // SRC_TINT_LANG_CORE_IR_IR_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_CORE_IR_IR_HELPER_TEST_H_
diff --git a/src/tint/lang/core/ir/let_test.cc b/src/tint/lang/core/ir/let_test.cc
index 1709118..f8c1097 100644
--- a/src/tint/lang/core/ir/let_test.cc
+++ b/src/tint/lang/core/ir/let_test.cc
@@ -18,7 +18,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/builder.h"
#include "src/tint/lang/core/ir/instruction.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/load_test.cc b/src/tint/lang/core/ir/load_test.cc
index 882f0a0..68ccf50 100644
--- a/src/tint/lang/core/ir/load_test.cc
+++ b/src/tint/lang/core/ir/load_test.cc
@@ -16,7 +16,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/builder.h"
#include "src/tint/lang/core/ir/instruction.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/load_vector_element_test.cc b/src/tint/lang/core/ir/load_vector_element_test.cc
index 5c99760..f81f0a01 100644
--- a/src/tint/lang/core/ir/load_vector_element_test.cc
+++ b/src/tint/lang/core/ir/load_vector_element_test.cc
@@ -16,7 +16,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/builder.h"
#include "src/tint/lang/core/ir/instruction.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/loop_test.cc b/src/tint/lang/core/ir/loop_test.cc
index 33be89e..be5877d 100644
--- a/src/tint/lang/core/ir/loop_test.cc
+++ b/src/tint/lang/core/ir/loop_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/ir/loop.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/module_test.cc b/src/tint/lang/core/ir/module_test.cc
index fb4bf42..545c28b 100644
--- a/src/tint/lang/core/ir/module_test.cc
+++ b/src/tint/lang/core/ir/module_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/core/ir/module.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
#include "src/tint/lang/core/ir/var.h"
namespace tint::ir {
diff --git a/src/tint/lang/core/ir/multi_in_block_test.cc b/src/tint/lang/core/ir/multi_in_block_test.cc
index 19e113a..95b3f57 100644
--- a/src/tint/lang/core/ir/multi_in_block_test.cc
+++ b/src/tint/lang/core/ir/multi_in_block_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/core/ir/multi_in_block.h"
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/block_param.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/next_iteration_test.cc b/src/tint/lang/core/ir/next_iteration_test.cc
index 780507a..841b9c6 100644
--- a/src/tint/lang/core/ir/next_iteration_test.cc
+++ b/src/tint/lang/core/ir/next_iteration_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/ir/next_iteration.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/operand_instruction_test.cc b/src/tint/lang/core/ir/operand_instruction_test.cc
index fe7c0d2..43e4af8 100644
--- a/src/tint/lang/core/ir/operand_instruction_test.cc
+++ b/src/tint/lang/core/ir/operand_instruction_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/return_test.cc b/src/tint/lang/core/ir/return_test.cc
index ef6b64e..21ecb2d 100644
--- a/src/tint/lang/core/ir/return_test.cc
+++ b/src/tint/lang/core/ir/return_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/store_test.cc b/src/tint/lang/core/ir/store_test.cc
index ccd52d3..3a1958f 100644
--- a/src/tint/lang/core/ir/store_test.cc
+++ b/src/tint/lang/core/ir/store_test.cc
@@ -16,7 +16,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/builder.h"
#include "src/tint/lang/core/ir/instruction.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/store_vector_element_test.cc b/src/tint/lang/core/ir/store_vector_element_test.cc
index 386a0f7..fe28a84 100644
--- a/src/tint/lang/core/ir/store_vector_element_test.cc
+++ b/src/tint/lang/core/ir/store_vector_element_test.cc
@@ -16,7 +16,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/builder.h"
#include "src/tint/lang/core/ir/instruction.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/switch_test.cc b/src/tint/lang/core/ir/switch_test.cc
index 5281199..92e6486 100644
--- a/src/tint/lang/core/ir/switch_test.cc
+++ b/src/tint/lang/core/ir/switch_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/swizzle_test.cc b/src/tint/lang/core/ir/swizzle_test.cc
index 63954a2..2f58359 100644
--- a/src/tint/lang/core/ir/swizzle_test.cc
+++ b/src/tint/lang/core/ir/swizzle_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
using namespace tint::builtin::fluent_types; // NOLINT
diff --git a/src/tint/lang/core/ir/transform/add_empty_entry_point_test.cc b/src/tint/lang/core/ir/transform/add_empty_entry_point_test.cc
index b86c71d..29c9e6f 100644
--- a/src/tint/lang/core/ir/transform/add_empty_entry_point_test.cc
+++ b/src/tint/lang/core/ir/transform/add_empty_entry_point_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/core/ir/transform/test_helper.h"
+#include "src/tint/lang/core/ir/transform/helper_test.h"
namespace tint::ir::transform {
namespace {
diff --git a/src/tint/lang/core/ir/transform/block_decorated_structs_test.cc b/src/tint/lang/core/ir/transform/block_decorated_structs_test.cc
index c978d20..2ee009f 100644
--- a/src/tint/lang/core/ir/transform/block_decorated_structs_test.cc
+++ b/src/tint/lang/core/ir/transform/block_decorated_structs_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/core/ir/transform/test_helper.h"
+#include "src/tint/lang/core/ir/transform/helper_test.h"
#include "src/tint/lang/core/type/array.h"
#include "src/tint/lang/core/type/pointer.h"
#include "src/tint/lang/core/type/struct.h"
diff --git a/src/tint/lang/core/ir/transform/builtin_polyfill_spirv_test.cc b/src/tint/lang/core/ir/transform/builtin_polyfill_spirv_test.cc
index 2b4648d..41119b9 100644
--- a/src/tint/lang/core/ir/transform/builtin_polyfill_spirv_test.cc
+++ b/src/tint/lang/core/ir/transform/builtin_polyfill_spirv_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/core/ir/transform/test_helper.h"
+#include "src/tint/lang/core/ir/transform/helper_test.h"
#include "src/tint/lang/core/type/array.h"
#include "src/tint/lang/core/type/atomic.h"
#include "src/tint/lang/core/type/builtin_structs.h"
diff --git a/src/tint/lang/core/ir/transform/demote_to_helper_test.cc b/src/tint/lang/core/ir/transform/demote_to_helper_test.cc
index 92b3046..2a672bd 100644
--- a/src/tint/lang/core/ir/transform/demote_to_helper_test.cc
+++ b/src/tint/lang/core/ir/transform/demote_to_helper_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/core/ir/transform/test_helper.h"
+#include "src/tint/lang/core/ir/transform/helper_test.h"
#include "src/tint/lang/core/type/builtin_structs.h"
#include "src/tint/lang/core/type/f32.h"
#include "src/tint/lang/core/type/storage_texture.h"
diff --git a/src/tint/lang/core/ir/transform/expand_implicit_splats_test.cc b/src/tint/lang/core/ir/transform/expand_implicit_splats_test.cc
index 66a23cc..8aacea6 100644
--- a/src/tint/lang/core/ir/transform/expand_implicit_splats_test.cc
+++ b/src/tint/lang/core/ir/transform/expand_implicit_splats_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/core/ir/transform/test_helper.h"
+#include "src/tint/lang/core/ir/transform/helper_test.h"
namespace tint::ir::transform {
namespace {
diff --git a/src/tint/lang/core/ir/transform/handle_matrix_arithmetic_test.cc b/src/tint/lang/core/ir/transform/handle_matrix_arithmetic_test.cc
index 462f0c8..86fcbcc 100644
--- a/src/tint/lang/core/ir/transform/handle_matrix_arithmetic_test.cc
+++ b/src/tint/lang/core/ir/transform/handle_matrix_arithmetic_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/core/ir/transform/test_helper.h"
+#include "src/tint/lang/core/ir/transform/helper_test.h"
#include "src/tint/lang/core/type/matrix.h"
namespace tint::ir::transform {
diff --git a/src/tint/lang/core/ir/transform/test_helper.h b/src/tint/lang/core/ir/transform/helper_test.h
similarity index 92%
rename from src/tint/lang/core/ir/transform/test_helper.h
rename to src/tint/lang/core/ir/transform/helper_test.h
index 9b51929..91a03df 100644
--- a/src/tint/lang/core/ir/transform/test_helper.h
+++ b/src/tint/lang/core/ir/transform/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_CORE_IR_TRANSFORM_TEST_HELPER_H_
-#define SRC_TINT_LANG_CORE_IR_TRANSFORM_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_CORE_IR_TRANSFORM_HELPER_TEST_H_
+#define SRC_TINT_LANG_CORE_IR_TRANSFORM_HELPER_TEST_H_
#include <memory>
#include <string>
@@ -74,4 +74,4 @@
} // namespace tint::ir::transform
-#endif // SRC_TINT_LANG_CORE_IR_TRANSFORM_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_CORE_IR_TRANSFORM_HELPER_TEST_H_
diff --git a/src/tint/lang/core/ir/transform/merge_return_test.cc b/src/tint/lang/core/ir/transform/merge_return_test.cc
index 2fb5bd0..e36c2ff 100644
--- a/src/tint/lang/core/ir/transform/merge_return_test.cc
+++ b/src/tint/lang/core/ir/transform/merge_return_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/core/ir/transform/test_helper.h"
+#include "src/tint/lang/core/ir/transform/helper_test.h"
namespace tint::ir::transform {
namespace {
diff --git a/src/tint/lang/core/ir/transform/shader_io_spirv_test.cc b/src/tint/lang/core/ir/transform/shader_io_spirv_test.cc
index dd11fcc..d2ff101 100644
--- a/src/tint/lang/core/ir/transform/shader_io_spirv_test.cc
+++ b/src/tint/lang/core/ir/transform/shader_io_spirv_test.cc
@@ -14,8 +14,8 @@
#include <utility>
+#include "src/tint/lang/core/ir/transform/helper_test.h"
#include "src/tint/lang/core/ir/transform/shader_io_spirv.h"
-#include "src/tint/lang/core/ir/transform/test_helper.h"
#include "src/tint/lang/core/type/struct.h"
namespace tint::ir::transform {
diff --git a/src/tint/lang/core/ir/transform/std140_test.cc b/src/tint/lang/core/ir/transform/std140_test.cc
index 439db86..36e48cf 100644
--- a/src/tint/lang/core/ir/transform/std140_test.cc
+++ b/src/tint/lang/core/ir/transform/std140_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/core/ir/transform/test_helper.h"
+#include "src/tint/lang/core/ir/transform/helper_test.h"
#include "src/tint/lang/core/type/array.h"
#include "src/tint/lang/core/type/matrix.h"
#include "src/tint/lang/core/type/pointer.h"
diff --git a/src/tint/lang/core/ir/transform/var_for_dynamic_index_test.cc b/src/tint/lang/core/ir/transform/var_for_dynamic_index_test.cc
index e0c6dd2..6e1ee7a 100644
--- a/src/tint/lang/core/ir/transform/var_for_dynamic_index_test.cc
+++ b/src/tint/lang/core/ir/transform/var_for_dynamic_index_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/core/ir/transform/test_helper.h"
+#include "src/tint/lang/core/ir/transform/helper_test.h"
#include "src/tint/lang/core/type/array.h"
#include "src/tint/lang/core/type/matrix.h"
#include "src/tint/lang/core/type/struct.h"
diff --git a/src/tint/lang/core/ir/unary_test.cc b/src/tint/lang/core/ir/unary_test.cc
index cfc42f1..fb378eb 100644
--- a/src/tint/lang/core/ir/unary_test.cc
+++ b/src/tint/lang/core/ir/unary_test.cc
@@ -16,7 +16,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/builder.h"
#include "src/tint/lang/core/ir/instruction.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/user_call_test.cc b/src/tint/lang/core/ir/user_call_test.cc
index b216390..9ca242e 100644
--- a/src/tint/lang/core/ir/user_call_test.cc
+++ b/src/tint/lang/core/ir/user_call_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/ir/validator_test.cc b/src/tint/lang/core/ir/validator_test.cc
index 69f526d..87fed40 100644
--- a/src/tint/lang/core/ir/validator_test.cc
+++ b/src/tint/lang/core/ir/validator_test.cc
@@ -17,7 +17,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/core/ir/builder.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
#include "src/tint/lang/core/ir/validator.h"
#include "src/tint/lang/core/type/array.h"
#include "src/tint/lang/core/type/matrix.h"
diff --git a/src/tint/lang/core/ir/value_test.cc b/src/tint/lang/core/ir/value_test.cc
index 573ceeb..bf005b7 100644
--- a/src/tint/lang/core/ir/value_test.cc
+++ b/src/tint/lang/core/ir/value_test.cc
@@ -14,7 +14,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
using namespace tint::number_suffixes; // NOLINT
using namespace tint::builtin::fluent_types; // NOLINT
diff --git a/src/tint/lang/core/ir/var_test.cc b/src/tint/lang/core/ir/var_test.cc
index c8f9d69..5054b4c 100644
--- a/src/tint/lang/core/ir/var_test.cc
+++ b/src/tint/lang/core/ir/var_test.cc
@@ -18,7 +18,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/ir/builder.h"
#include "src/tint/lang/core/ir/instruction.h"
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/core/type/array_test.cc b/src/tint/lang/core/type/array_test.cc
index 8932d75..d07d719 100644
--- a/src/tint/lang/core/type/array_test.cc
+++ b/src/tint/lang/core/type/array_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/texture.h"
#include "src/tint/lang/wgsl/sem/array_count.h"
diff --git a/src/tint/lang/core/type/atomic_test.cc b/src/tint/lang/core/type/atomic_test.cc
index a5bffce..8ff9232 100644
--- a/src/tint/lang/core/type/atomic_test.cc
+++ b/src/tint/lang/core/type/atomic_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/type/atomic.h"
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
namespace tint::type {
namespace {
diff --git a/src/tint/lang/core/type/bool_test.cc b/src/tint/lang/core/type/bool_test.cc
index 1bcce0b..39d08a4 100644
--- a/src/tint/lang/core/type/bool_test.cc
+++ b/src/tint/lang/core/type/bool_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/texture.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/depth_multisampled_texture_test.cc b/src/tint/lang/core/type/depth_multisampled_texture_test.cc
index 5727660..04f6a1e 100644
--- a/src/tint/lang/core/type/depth_multisampled_texture_test.cc
+++ b/src/tint/lang/core/type/depth_multisampled_texture_test.cc
@@ -15,9 +15,9 @@
#include "src/tint/lang/core/type/depth_multisampled_texture.h"
#include "src/tint/lang/core/type/external_texture.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/sampled_texture.h"
#include "src/tint/lang/core/type/storage_texture.h"
-#include "src/tint/lang/core/type/test_helper.h"
#include "src/tint/lang/core/type/texture_dimension.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/depth_texture_test.cc b/src/tint/lang/core/type/depth_texture_test.cc
index ecc6d1d..b82ec7b 100644
--- a/src/tint/lang/core/type/depth_texture_test.cc
+++ b/src/tint/lang/core/type/depth_texture_test.cc
@@ -15,9 +15,9 @@
#include "src/tint/lang/core/type/depth_texture.h"
#include "src/tint/lang/core/type/external_texture.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/sampled_texture.h"
#include "src/tint/lang/core/type/storage_texture.h"
-#include "src/tint/lang/core/type/test_helper.h"
#include "src/tint/lang/core/type/texture_dimension.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/external_texture_test.cc b/src/tint/lang/core/type/external_texture_test.cc
index e728346..c850e9b 100644
--- a/src/tint/lang/core/type/external_texture_test.cc
+++ b/src/tint/lang/core/type/external_texture_test.cc
@@ -15,10 +15,10 @@
#include "src/tint/lang/core/type/external_texture.h"
#include "src/tint/lang/core/type/depth_texture.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/multisampled_texture.h"
#include "src/tint/lang/core/type/sampled_texture.h"
#include "src/tint/lang/core/type/storage_texture.h"
-#include "src/tint/lang/core/type/test_helper.h"
#include "src/tint/lang/core/type/texture_dimension.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/f16_test.cc b/src/tint/lang/core/type/f16_test.cc
index 45c37be..f1b083e 100644
--- a/src/tint/lang/core/type/f16_test.cc
+++ b/src/tint/lang/core/type/f16_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/texture.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/f32_test.cc b/src/tint/lang/core/type/f32_test.cc
index 9e77c95..5acab85 100644
--- a/src/tint/lang/core/type/f32_test.cc
+++ b/src/tint/lang/core/type/f32_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/texture.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/test_helper.h b/src/tint/lang/core/type/helper_test.h
similarity index 93%
rename from src/tint/lang/core/type/test_helper.h
rename to src/tint/lang/core/type/helper_test.h
index 0b093e8..58b8b48 100644
--- a/src/tint/lang/core/type/test_helper.h
+++ b/src/tint/lang/core/type/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_CORE_TYPE_TEST_HELPER_H_
-#define SRC_TINT_LANG_CORE_TYPE_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_CORE_TYPE_HELPER_TEST_H_
+#define SRC_TINT_LANG_CORE_TYPE_HELPER_TEST_H_
#include <utility>
@@ -55,4 +55,4 @@
} \
} while (false)
-#endif // SRC_TINT_LANG_CORE_TYPE_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_CORE_TYPE_HELPER_TEST_H_
diff --git a/src/tint/lang/core/type/i32_test.cc b/src/tint/lang/core/type/i32_test.cc
index 8c30487..5b9786c 100644
--- a/src/tint/lang/core/type/i32_test.cc
+++ b/src/tint/lang/core/type/i32_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/texture.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/matrix_test.cc b/src/tint/lang/core/type/matrix_test.cc
index f933d81..914ade6 100644
--- a/src/tint/lang/core/type/matrix_test.cc
+++ b/src/tint/lang/core/type/matrix_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/texture.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/multisampled_texture_test.cc b/src/tint/lang/core/type/multisampled_texture_test.cc
index daca149..fcbd1d3 100644
--- a/src/tint/lang/core/type/multisampled_texture_test.cc
+++ b/src/tint/lang/core/type/multisampled_texture_test.cc
@@ -16,9 +16,9 @@
#include "src/tint/lang/core/type/depth_texture.h"
#include "src/tint/lang/core/type/external_texture.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/sampled_texture.h"
#include "src/tint/lang/core/type/storage_texture.h"
-#include "src/tint/lang/core/type/test_helper.h"
#include "src/tint/lang/core/type/texture_dimension.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/pointer_test.cc b/src/tint/lang/core/type/pointer_test.cc
index 112935a..76e933c 100644
--- a/src/tint/lang/core/type/pointer_test.cc
+++ b/src/tint/lang/core/type/pointer_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/core/builtin/address_space.h"
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/texture.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/reference_test.cc b/src/tint/lang/core/type/reference_test.cc
index 6b877a1..489c547 100644
--- a/src/tint/lang/core/type/reference_test.cc
+++ b/src/tint/lang/core/type/reference_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/type/reference.h"
#include "src/tint/lang/core/builtin/address_space.h"
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
namespace tint::type {
namespace {
diff --git a/src/tint/lang/core/type/sampled_texture_test.cc b/src/tint/lang/core/type/sampled_texture_test.cc
index 216b7cc..375e423 100644
--- a/src/tint/lang/core/type/sampled_texture_test.cc
+++ b/src/tint/lang/core/type/sampled_texture_test.cc
@@ -16,8 +16,8 @@
#include "src/tint/lang/core/type/depth_texture.h"
#include "src/tint/lang/core/type/external_texture.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/storage_texture.h"
-#include "src/tint/lang/core/type/test_helper.h"
#include "src/tint/lang/core/type/texture_dimension.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/sampler_test.cc b/src/tint/lang/core/type/sampler_test.cc
index ad03ab3..7b9657f 100644
--- a/src/tint/lang/core/type/sampler_test.cc
+++ b/src/tint/lang/core/type/sampler_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/core/type/sampler.h"
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/texture.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/storage_texture_test.cc b/src/tint/lang/core/type/storage_texture_test.cc
index e4ec969..086fdd7 100644
--- a/src/tint/lang/core/type/storage_texture_test.cc
+++ b/src/tint/lang/core/type/storage_texture_test.cc
@@ -16,8 +16,8 @@
#include "src/tint/lang/core/type/depth_texture.h"
#include "src/tint/lang/core/type/external_texture.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/sampled_texture.h"
-#include "src/tint/lang/core/type/test_helper.h"
#include "src/tint/lang/core/type/texture_dimension.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/struct_test.cc b/src/tint/lang/core/type/struct_test.cc
index 658463e..7a743fd 100644
--- a/src/tint/lang/core/type/struct_test.cc
+++ b/src/tint/lang/core/type/struct_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/core/type/struct.h"
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/texture.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/texture_test.cc b/src/tint/lang/core/type/texture_test.cc
index cfffe58..55aa370 100644
--- a/src/tint/lang/core/type/texture_test.cc
+++ b/src/tint/lang/core/type/texture_test.cc
@@ -14,8 +14,8 @@
#include "src/tint/lang/core/type/texture.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/sampled_texture.h"
-#include "src/tint/lang/core/type/test_helper.h"
namespace tint::type {
namespace {
diff --git a/src/tint/lang/core/type/type_test.cc b/src/tint/lang/core/type/type_test.cc
index 293965c..3ef56a4 100644
--- a/src/tint/lang/core/type/type_test.cc
+++ b/src/tint/lang/core/type/type_test.cc
@@ -16,8 +16,8 @@
#include "src/tint/lang/core/type/abstract_int.h"
#include "src/tint/lang/core/type/array_count.h"
#include "src/tint/lang/core/type/f16.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/reference.h"
-#include "src/tint/lang/core/type/test_helper.h"
namespace tint::type {
namespace {
diff --git a/src/tint/lang/core/type/u32_test.cc b/src/tint/lang/core/type/u32_test.cc
index edf3969..54e9898 100644
--- a/src/tint/lang/core/type/u32_test.cc
+++ b/src/tint/lang/core/type/u32_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/texture.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/vector_test.cc b/src/tint/lang/core/type/vector_test.cc
index fb97aa01..85e28d1 100644
--- a/src/tint/lang/core/type/vector_test.cc
+++ b/src/tint/lang/core/type/vector_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/texture.h"
namespace tint::type {
diff --git a/src/tint/lang/glsl/writer/ast_printer/array_accessor_test.cc b/src/tint/lang/glsl/writer/ast_printer/array_accessor_test.cc
index 0f74331..2824513 100644
--- a/src/tint/lang/glsl/writer/ast_printer/array_accessor_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/array_accessor_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/assign_test.cc b/src/tint/lang/glsl/writer/ast_printer/assign_test.cc
index 15f9d88..c2a4719 100644
--- a/src/tint/lang/glsl/writer/ast_printer/assign_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/assign_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/ast_printer_test.cc b/src/tint/lang/glsl/writer/ast_printer/ast_printer_test.cc
index cd915cd..17a6349 100644
--- a/src/tint/lang/glsl/writer/ast_printer/ast_printer_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/ast_printer_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/binary_test.cc b/src/tint/lang/glsl/writer/ast_printer/binary_test.cc
index d0e862d..4a9c515 100644
--- a/src/tint/lang/glsl/writer/ast_printer/binary_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/binary_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/bitcast_test.cc b/src/tint/lang/glsl/writer/ast_printer/bitcast_test.cc
index 8cdd8aa..61be256 100644
--- a/src/tint/lang/glsl/writer/ast_printer/bitcast_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/bitcast_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/block_test.cc b/src/tint/lang/glsl/writer/ast_printer/block_test.cc
index a8e4669..64b67b0 100644
--- a/src/tint/lang/glsl/writer/ast_printer/block_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/block_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/break_test.cc b/src/tint/lang/glsl/writer/ast_printer/break_test.cc
index c9db340..be014c6 100644
--- a/src/tint/lang/glsl/writer/ast_printer/break_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/break_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/builtin_test.cc b/src/tint/lang/glsl/writer/ast_printer/builtin_test.cc
index 779328a..37bc97e 100644
--- a/src/tint/lang/glsl/writer/ast_printer/builtin_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/builtin_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/sem/call.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/builtin_texture_test.cc b/src/tint/lang/glsl/writer/ast_printer/builtin_texture_test.cc
index 3bccd82..f2244e2 100644
--- a/src/tint/lang/glsl/writer/ast_printer/builtin_texture_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/builtin_texture_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/call_test.cc b/src/tint/lang/glsl/writer/ast_printer/call_test.cc
index 58345e7..aa81a8e 100644
--- a/src/tint/lang/glsl/writer/ast_printer/call_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/call_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/case_test.cc b/src/tint/lang/glsl/writer/ast_printer/case_test.cc
index 81511bc..8e4af9e 100644
--- a/src/tint/lang/glsl/writer/ast_printer/case_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/case_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/cast_test.cc b/src/tint/lang/glsl/writer/ast_printer/cast_test.cc
index 42aca9d..505fe65 100644
--- a/src/tint/lang/glsl/writer/ast_printer/cast_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/cast_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/constructor_test.cc b/src/tint/lang/glsl/writer/ast_printer/constructor_test.cc
index 1c1b32c..d971209 100644
--- a/src/tint/lang/glsl/writer/ast_printer/constructor_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/constructor_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
namespace tint::glsl::writer {
namespace {
diff --git a/src/tint/lang/glsl/writer/ast_printer/continue_test.cc b/src/tint/lang/glsl/writer/ast_printer/continue_test.cc
index e689af6..5474ee6 100644
--- a/src/tint/lang/glsl/writer/ast_printer/continue_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/continue_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/discard_test.cc b/src/tint/lang/glsl/writer/ast_printer/discard_test.cc
index 67c8b6e..d450bcd 100644
--- a/src/tint/lang/glsl/writer/ast_printer/discard_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/discard_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/function_test.cc b/src/tint/lang/glsl/writer/ast_printer/function_test.cc
index 701eb6f..3f1e0df 100644
--- a/src/tint/lang/glsl/writer/ast_printer/function_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/function_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/test_helper.h b/src/tint/lang/glsl/writer/ast_printer/helper_test.h
similarity index 94%
rename from src/tint/lang/glsl/writer/ast_printer/test_helper.h
rename to src/tint/lang/glsl/writer/ast_printer/helper_test.h
index dbd06df..d2f150a 100644
--- a/src/tint/lang/glsl/writer/ast_printer/test_helper.h
+++ b/src/tint/lang/glsl/writer/ast_printer/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_GLSL_WRITER_AST_PRINTER_TEST_HELPER_H_
-#define SRC_TINT_LANG_GLSL_WRITER_AST_PRINTER_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_GLSL_WRITER_AST_PRINTER_HELPER_TEST_H_
+#define SRC_TINT_LANG_GLSL_WRITER_AST_PRINTER_HELPER_TEST_H_
#include <memory>
#include <string>
@@ -103,4 +103,4 @@
} // namespace tint::glsl::writer
-#endif // SRC_TINT_LANG_GLSL_WRITER_AST_PRINTER_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_GLSL_WRITER_AST_PRINTER_HELPER_TEST_H_
diff --git a/src/tint/lang/glsl/writer/ast_printer/identifier_test.cc b/src/tint/lang/glsl/writer/ast_printer/identifier_test.cc
index 00aeab1..e30ce92 100644
--- a/src/tint/lang/glsl/writer/ast_printer/identifier_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/identifier_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/if_test.cc b/src/tint/lang/glsl/writer/ast_printer/if_test.cc
index 562e344..8be735f 100644
--- a/src/tint/lang/glsl/writer/ast_printer/if_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/if_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/import_test.cc b/src/tint/lang/glsl/writer/ast_printer/import_test.cc
index ff2a76e..9270ce8 100644
--- a/src/tint/lang/glsl/writer/ast_printer/import_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/import_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/loop_test.cc b/src/tint/lang/glsl/writer/ast_printer/loop_test.cc
index 0d09b5a..3526413 100644
--- a/src/tint/lang/glsl/writer/ast_printer/loop_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/loop_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/member_accessor_test.cc b/src/tint/lang/glsl/writer/ast_printer/member_accessor_test.cc
index 7c9aaac..b5c4eac 100644
--- a/src/tint/lang/glsl/writer/ast_printer/member_accessor_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/member_accessor_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/module_constant_test.cc b/src/tint/lang/glsl/writer/ast_printer/module_constant_test.cc
index ca037c8..5ce2912 100644
--- a/src/tint/lang/glsl/writer/ast_printer/module_constant_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/module_constant_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/id_attribute.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/return_test.cc b/src/tint/lang/glsl/writer/ast_printer/return_test.cc
index 771c875..fc06aedb 100644
--- a/src/tint/lang/glsl/writer/ast_printer/return_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/return_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/sanitizer_test.cc b/src/tint/lang/glsl/writer/ast_printer/sanitizer_test.cc
index 516e593..0f53d00 100644
--- a/src/tint/lang/glsl/writer/ast_printer/sanitizer_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/sanitizer_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/storage_buffer_test.cc b/src/tint/lang/glsl/writer/ast_printer/storage_buffer_test.cc
index bbf188c..cbbe58f 100644
--- a/src/tint/lang/glsl/writer/ast_printer/storage_buffer_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/storage_buffer_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/core/builtin/number.h"
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/switch_test.cc b/src/tint/lang/glsl/writer/ast_printer/switch_test.cc
index 06b4ec0..748eb52 100644
--- a/src/tint/lang/glsl/writer/ast_printer/switch_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/switch_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/type_test.cc b/src/tint/lang/glsl/writer/ast_printer/type_test.cc
index 952a2c1..32d00b76 100644
--- a/src/tint/lang/glsl/writer/ast_printer/type_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/type_test.cc
@@ -18,7 +18,7 @@
#include "src/tint/lang/core/type/sampler.h"
#include "src/tint/lang/core/type/storage_texture.h"
#include "src/tint/lang/core/type/texture_dimension.h"
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/unary_op_test.cc b/src/tint/lang/glsl/writer/ast_printer/unary_op_test.cc
index 0dcb634..7bb3794 100644
--- a/src/tint/lang/glsl/writer/ast_printer/unary_op_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/unary_op_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/uniform_buffer_test.cc b/src/tint/lang/glsl/writer/ast_printer/uniform_buffer_test.cc
index feeaa35..65a11b9 100644
--- a/src/tint/lang/glsl/writer/ast_printer/uniform_buffer_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/uniform_buffer_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/variable_decl_statement_test.cc b/src/tint/lang/glsl/writer/ast_printer/variable_decl_statement_test.cc
index 6cfcacd..d5b5da7 100644
--- a/src/tint/lang/glsl/writer/ast_printer/variable_decl_statement_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/variable_decl_statement_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/writer/ast_printer/workgroup_var_test.cc b/src/tint/lang/glsl/writer/ast_printer/workgroup_var_test.cc
index 2c2f2b3..c1e18fe 100644
--- a/src/tint/lang/glsl/writer/ast_printer/workgroup_var_test.cc
+++ b/src/tint/lang/glsl/writer/ast_printer/workgroup_var_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/glsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/glsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/id_attribute.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
diff --git a/src/tint/lang/hlsl/writer/ast_printer/array_accessor_test.cc b/src/tint/lang/hlsl/writer/ast_printer/array_accessor_test.cc
index af8a9d8..22bf04a 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/array_accessor_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/array_accessor_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/hlsl/writer/ast_printer/assign_test.cc b/src/tint/lang/hlsl/writer/ast_printer/assign_test.cc
index cf0b503..c0e3f02 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/assign_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/assign_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/hlsl/writer/ast_printer/ast_printer_test.cc b/src/tint/lang/hlsl/writer/ast_printer/ast_printer_test.cc
index 72af79f..5187dd2 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/ast_printer_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/ast_printer_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/hlsl/writer/writer.h"
diff --git a/src/tint/lang/hlsl/writer/ast_printer/binary_test.cc b/src/tint/lang/hlsl/writer/ast_printer/binary_test.cc
index e1e7088..4575024 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/binary_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/binary_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/hlsl/writer/ast_printer/bitcast_test.cc b/src/tint/lang/hlsl/writer/ast_printer/bitcast_test.cc
index ddba795..217fefd 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/bitcast_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/bitcast_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/hlsl/writer/ast_printer/block_test.cc b/src/tint/lang/hlsl/writer/ast_printer/block_test.cc
index 6001f18..e346b95 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/block_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/block_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
namespace tint::hlsl::writer {
namespace {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/break_test.cc b/src/tint/lang/hlsl/writer/ast_printer/break_test.cc
index a20277f..242bb35 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/break_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/break_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
namespace tint::hlsl::writer {
namespace {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/builtin_test.cc b/src/tint/lang/hlsl/writer/ast_printer/builtin_test.cc
index 81109c3..6c26ebf 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/builtin_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/builtin_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/sem/call.h"
diff --git a/src/tint/lang/hlsl/writer/ast_printer/builtin_texture_test.cc b/src/tint/lang/hlsl/writer/ast_printer/builtin_texture_test.cc
index 902d15f..af53bac 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/builtin_texture_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/builtin_texture_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
diff --git a/src/tint/lang/hlsl/writer/ast_printer/call_test.cc b/src/tint/lang/hlsl/writer/ast_printer/call_test.cc
index 9aad31c..ff8468a 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/call_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/call_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/hlsl/writer/ast_printer/case_test.cc b/src/tint/lang/hlsl/writer/ast_printer/case_test.cc
index ea37007..532997c 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/case_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/case_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/hlsl/writer/ast_printer/cast_test.cc b/src/tint/lang/hlsl/writer/ast_printer/cast_test.cc
index 44d74b8..b566f51 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/cast_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/cast_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::hlsl::writer {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/const_assert_test.cc b/src/tint/lang/hlsl/writer/ast_printer/const_assert_test.cc
index b8b0717..7c23806 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/const_assert_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/const_assert_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/hlsl/writer/ast_printer/constructor_test.cc b/src/tint/lang/hlsl/writer/ast_printer/constructor_test.cc
index 550cfa3..6e3b106 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/constructor_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/constructor_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
namespace tint::hlsl::writer {
namespace {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/continue_test.cc b/src/tint/lang/hlsl/writer/ast_printer/continue_test.cc
index faffec3..7edf7be 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/continue_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/continue_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
namespace tint::hlsl::writer {
namespace {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/discard_test.cc b/src/tint/lang/hlsl/writer/ast_printer/discard_test.cc
index c416262..af92ac9 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/discard_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/discard_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
namespace tint::hlsl::writer {
namespace {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/function_test.cc b/src/tint/lang/hlsl/writer/ast_printer/function_test.cc
index dd24085..e852f02 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/function_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/function_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
diff --git a/src/tint/lang/hlsl/writer/ast_printer/test_helper.h b/src/tint/lang/hlsl/writer/ast_printer/helper_test.h
similarity index 95%
rename from src/tint/lang/hlsl/writer/ast_printer/test_helper.h
rename to src/tint/lang/hlsl/writer/ast_printer/helper_test.h
index 51801b7..a75aaed 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/test_helper.h
+++ b/src/tint/lang/hlsl/writer/ast_printer/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_HLSL_WRITER_AST_PRINTER_TEST_HELPER_H_
-#define SRC_TINT_LANG_HLSL_WRITER_AST_PRINTER_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_HLSL_WRITER_AST_PRINTER_HELPER_TEST_H_
+#define SRC_TINT_LANG_HLSL_WRITER_AST_PRINTER_HELPER_TEST_H_
#include <memory>
#include <string>
@@ -114,4 +114,4 @@
} // namespace tint::hlsl::writer
-#endif // SRC_TINT_LANG_HLSL_WRITER_AST_PRINTER_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_HLSL_WRITER_AST_PRINTER_HELPER_TEST_H_
diff --git a/src/tint/lang/hlsl/writer/ast_printer/identifier_test.cc b/src/tint/lang/hlsl/writer/ast_printer/identifier_test.cc
index c37cef8..2013a16 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/identifier_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/identifier_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::hlsl::writer {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/if_test.cc b/src/tint/lang/hlsl/writer/ast_printer/if_test.cc
index 16b8d17..bee30a5 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/if_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/if_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
namespace tint::hlsl::writer {
namespace {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/import_test.cc b/src/tint/lang/hlsl/writer/ast_printer/import_test.cc
index 6482e3a..365b084 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/import_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/import_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::hlsl::writer {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/loop_test.cc b/src/tint/lang/hlsl/writer/ast_printer/loop_test.cc
index 2ac0ca7..e5cccaa 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/loop_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/loop_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/hlsl/writer/ast_printer/member_accessor_test.cc b/src/tint/lang/hlsl/writer/ast_printer/member_accessor_test.cc
index f984383..513ca1e 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/member_accessor_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/member_accessor_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
using ::testing::HasSubstr;
diff --git a/src/tint/lang/hlsl/writer/ast_printer/module_constant_test.cc b/src/tint/lang/hlsl/writer/ast_printer/module_constant_test.cc
index a1bd8d4..d3c1c99 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/module_constant_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/module_constant_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/id_attribute.h"
namespace tint::hlsl::writer {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/return_test.cc b/src/tint/lang/hlsl/writer/ast_printer/return_test.cc
index 432c55e..b856a56 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/return_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/return_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/hlsl/writer/ast_printer/sanitizer_test.cc b/src/tint/lang/hlsl/writer/ast_printer/sanitizer_test.cc
index f98a547..074886b 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/sanitizer_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/sanitizer_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
diff --git a/src/tint/lang/hlsl/writer/ast_printer/switch_test.cc b/src/tint/lang/hlsl/writer/ast_printer/switch_test.cc
index f69f375..fac13a1 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/switch_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/switch_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/hlsl/writer/ast_printer/type_test.cc b/src/tint/lang/hlsl/writer/ast_printer/type_test.cc
index e543ec4..71b8492 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/type_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/type_test.cc
@@ -19,7 +19,7 @@
#include "src/tint/lang/core/type/sampler.h"
#include "src/tint/lang/core/type/storage_texture.h"
#include "src/tint/lang/core/type/texture_dimension.h"
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/hlsl/writer/ast_printer/unary_op_test.cc b/src/tint/lang/hlsl/writer/ast_printer/unary_op_test.cc
index 839d10a..561ae06 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/unary_op_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/unary_op_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::hlsl::writer {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/variable_decl_statement_test.cc b/src/tint/lang/hlsl/writer/ast_printer/variable_decl_statement_test.cc
index 28b2374..abafc0d 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/variable_decl_statement_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/variable_decl_statement_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
namespace tint::hlsl::writer {
namespace {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/workgroup_var_test.cc b/src/tint/lang/hlsl/writer/ast_printer/workgroup_var_test.cc
index f8f1e19..f843bae 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/workgroup_var_test.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/workgroup_var_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/hlsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/hlsl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/id_attribute.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
diff --git a/src/tint/lang/msl/writer/ast_printer/array_accessor_test.cc b/src/tint/lang/msl/writer/ast_printer/array_accessor_test.cc
index 071e1ef..83a70311 100644
--- a/src/tint/lang/msl/writer/ast_printer/array_accessor_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/array_accessor_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/writer/ast_printer/assign_test.cc b/src/tint/lang/msl/writer/ast_printer/assign_test.cc
index c3f8a6f..0733840 100644
--- a/src/tint/lang/msl/writer/ast_printer/assign_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/assign_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
namespace tint::msl::writer {
namespace {
diff --git a/src/tint/lang/msl/writer/ast_printer/ast_function_test.cc b/src/tint/lang/msl/writer/ast_printer/ast_function_test.cc
index b18522b..cc977d7 100644
--- a/src/tint/lang/msl/writer/ast_printer/ast_function_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/ast_function_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
diff --git a/src/tint/lang/msl/writer/ast_printer/ast_printer_test.cc b/src/tint/lang/msl/writer/ast_printer/ast_printer_test.cc
index 1603836..38e1087 100644
--- a/src/tint/lang/msl/writer/ast_printer/ast_printer_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/ast_printer_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/msl/writer/writer.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
diff --git a/src/tint/lang/msl/writer/ast_printer/ast_type_test.cc b/src/tint/lang/msl/writer/ast_printer/ast_type_test.cc
index ce9d642..0d69fc8 100644
--- a/src/tint/lang/msl/writer/ast_printer/ast_type_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/ast_type_test.cc
@@ -23,7 +23,7 @@
#include "src/tint/lang/core/type/sampler.h"
#include "src/tint/lang/core/type/storage_texture.h"
#include "src/tint/lang/core/type/texture_dimension.h"
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::msl::writer {
diff --git a/src/tint/lang/msl/writer/ast_printer/binary_test.cc b/src/tint/lang/msl/writer/ast_printer/binary_test.cc
index e8d9556..0452f76 100644
--- a/src/tint/lang/msl/writer/ast_printer/binary_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/binary_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::msl::writer {
diff --git a/src/tint/lang/msl/writer/ast_printer/bitcast_test.cc b/src/tint/lang/msl/writer/ast_printer/bitcast_test.cc
index 81ee78f..81302d4 100644
--- a/src/tint/lang/msl/writer/ast_printer/bitcast_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/bitcast_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/writer/ast_printer/block_test.cc b/src/tint/lang/msl/writer/ast_printer/block_test.cc
index 4a4a230..3363e44 100644
--- a/src/tint/lang/msl/writer/ast_printer/block_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/block_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
namespace tint::msl::writer {
namespace {
diff --git a/src/tint/lang/msl/writer/ast_printer/break_test.cc b/src/tint/lang/msl/writer/ast_printer/break_test.cc
index 6fee2da..eb99820 100644
--- a/src/tint/lang/msl/writer/ast_printer/break_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/break_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
namespace tint::msl::writer {
namespace {
diff --git a/src/tint/lang/msl/writer/ast_printer/builtin_test.cc b/src/tint/lang/msl/writer/ast_printer/builtin_test.cc
index ad6f92d..4a03d6c 100644
--- a/src/tint/lang/msl/writer/ast_printer/builtin_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/builtin_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/msl/writer/ast_printer/builtin_texture_test.cc b/src/tint/lang/msl/writer/ast_printer/builtin_texture_test.cc
index eabcf4e..dd614fe 100644
--- a/src/tint/lang/msl/writer/ast_printer/builtin_texture_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/builtin_texture_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/msl/writer/ast_printer/call_test.cc b/src/tint/lang/msl/writer/ast_printer/call_test.cc
index c6b4a5b..861129e 100644
--- a/src/tint/lang/msl/writer/ast_printer/call_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/call_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/msl/writer/ast_printer/case_test.cc b/src/tint/lang/msl/writer/ast_printer/case_test.cc
index bffde38..885f01b 100644
--- a/src/tint/lang/msl/writer/ast_printer/case_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/case_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/writer/ast_printer/cast_test.cc b/src/tint/lang/msl/writer/ast_printer/cast_test.cc
index e35aa6b..dbc66df 100644
--- a/src/tint/lang/msl/writer/ast_printer/cast_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/cast_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::msl::writer {
diff --git a/src/tint/lang/msl/writer/ast_printer/const_assert_test.cc b/src/tint/lang/msl/writer/ast_printer/const_assert_test.cc
index 7a41eef..826fca7 100644
--- a/src/tint/lang/msl/writer/ast_printer/const_assert_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/const_assert_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/writer/ast_printer/constructor_test.cc b/src/tint/lang/msl/writer/ast_printer/constructor_test.cc
index 913a6d0..d537d58 100644
--- a/src/tint/lang/msl/writer/ast_printer/constructor_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/constructor_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
namespace tint::msl::writer {
namespace {
diff --git a/src/tint/lang/msl/writer/ast_printer/continue_test.cc b/src/tint/lang/msl/writer/ast_printer/continue_test.cc
index 2141d8e..9649c77 100644
--- a/src/tint/lang/msl/writer/ast_printer/continue_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/continue_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
namespace tint::msl::writer {
namespace {
diff --git a/src/tint/lang/msl/writer/ast_printer/discard_test.cc b/src/tint/lang/msl/writer/ast_printer/discard_test.cc
index 939041a..716baca 100644
--- a/src/tint/lang/msl/writer/ast_printer/discard_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/discard_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
namespace tint::msl::writer {
namespace {
diff --git a/src/tint/lang/msl/writer/ast_printer/test_helper.h b/src/tint/lang/msl/writer/ast_printer/helper_test.h
similarity index 94%
rename from src/tint/lang/msl/writer/ast_printer/test_helper.h
rename to src/tint/lang/msl/writer/ast_printer/helper_test.h
index dd79b5a..aeb4982 100644
--- a/src/tint/lang/msl/writer/ast_printer/test_helper.h
+++ b/src/tint/lang/msl/writer/ast_printer/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_MSL_WRITER_AST_PRINTER_TEST_HELPER_H_
-#define SRC_TINT_LANG_MSL_WRITER_AST_PRINTER_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_MSL_WRITER_AST_PRINTER_HELPER_TEST_H_
+#define SRC_TINT_LANG_MSL_WRITER_AST_PRINTER_HELPER_TEST_H_
#include <memory>
#include <string>
@@ -94,4 +94,4 @@
} // namespace tint::msl::writer
-#endif // SRC_TINT_LANG_MSL_WRITER_AST_PRINTER_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_MSL_WRITER_AST_PRINTER_HELPER_TEST_H_
diff --git a/src/tint/lang/msl/writer/ast_printer/identifier_test.cc b/src/tint/lang/msl/writer/ast_printer/identifier_test.cc
index 4a96dca..bb7ded5 100644
--- a/src/tint/lang/msl/writer/ast_printer/identifier_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/identifier_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::msl::writer {
diff --git a/src/tint/lang/msl/writer/ast_printer/if_test.cc b/src/tint/lang/msl/writer/ast_printer/if_test.cc
index a6b8c9d..ab7ee4a 100644
--- a/src/tint/lang/msl/writer/ast_printer/if_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/if_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
namespace tint::msl::writer {
namespace {
diff --git a/src/tint/lang/msl/writer/ast_printer/import_test.cc b/src/tint/lang/msl/writer/ast_printer/import_test.cc
index e8a23be..a3da832 100644
--- a/src/tint/lang/msl/writer/ast_printer/import_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/import_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/msl/writer/ast_printer/loop_test.cc b/src/tint/lang/msl/writer/ast_printer/loop_test.cc
index 5a0ab36..a00ca79 100644
--- a/src/tint/lang/msl/writer/ast_printer/loop_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/loop_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/writer/ast_printer/member_accessor_test.cc b/src/tint/lang/msl/writer/ast_printer/member_accessor_test.cc
index 9bfae62..cb6f717 100644
--- a/src/tint/lang/msl/writer/ast_printer/member_accessor_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/member_accessor_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::msl::writer {
diff --git a/src/tint/lang/msl/writer/ast_printer/module_constant_test.cc b/src/tint/lang/msl/writer/ast_printer/module_constant_test.cc
index 06d0c94..83743c0 100644
--- a/src/tint/lang/msl/writer/ast_printer/module_constant_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/module_constant_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/id_attribute.h"
namespace tint::msl::writer {
diff --git a/src/tint/lang/msl/writer/ast_printer/return_test.cc b/src/tint/lang/msl/writer/ast_printer/return_test.cc
index f33122b..0ed655e 100644
--- a/src/tint/lang/msl/writer/ast_printer/return_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/return_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/writer/ast_printer/sanitizer_test.cc b/src/tint/lang/msl/writer/ast_printer/sanitizer_test.cc
index 079fe4c..26feb713 100644
--- a/src/tint/lang/msl/writer/ast_printer/sanitizer_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/sanitizer_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
diff --git a/src/tint/lang/msl/writer/ast_printer/switch_test.cc b/src/tint/lang/msl/writer/ast_printer/switch_test.cc
index 8e308a2..724d4e1 100644
--- a/src/tint/lang/msl/writer/ast_printer/switch_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/switch_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/writer/ast_printer/unary_op_test.cc b/src/tint/lang/msl/writer/ast_printer/unary_op_test.cc
index c82729b..89fabf2 100644
--- a/src/tint/lang/msl/writer/ast_printer/unary_op_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/unary_op_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::msl::writer {
diff --git a/src/tint/lang/msl/writer/ast_printer/variable_decl_statement_test.cc b/src/tint/lang/msl/writer/ast_printer/variable_decl_statement_test.cc
index c7b8344..4acb7be 100644
--- a/src/tint/lang/msl/writer/ast_printer/variable_decl_statement_test.cc
+++ b/src/tint/lang/msl/writer/ast_printer/variable_decl_statement_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/msl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/msl/writer/ast_printer/helper_test.h"
namespace tint::msl::writer {
namespace {
diff --git a/src/tint/lang/msl/writer/printer/constant_test.cc b/src/tint/lang/msl/writer/printer/constant_test.cc
index 9fa3f0c..b068308 100644
--- a/src/tint/lang/msl/writer/printer/constant_test.cc
+++ b/src/tint/lang/msl/writer/printer/constant_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/type/array.h"
#include "src/tint/lang/core/type/matrix.h"
-#include "src/tint/lang/msl/writer/printer/test_helper.h"
+#include "src/tint/lang/msl/writer/printer/helper_test.h"
#include "src/tint/utils/text/string.h"
namespace tint::msl::writer {
diff --git a/src/tint/lang/msl/writer/printer/function_test.cc b/src/tint/lang/msl/writer/printer/function_test.cc
index fd6041d..57c106c 100644
--- a/src/tint/lang/msl/writer/printer/function_test.cc
+++ b/src/tint/lang/msl/writer/printer/function_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/msl/writer/printer/test_helper.h"
+#include "src/tint/lang/msl/writer/printer/helper_test.h"
namespace tint::msl::writer {
namespace {
diff --git a/src/tint/lang/msl/writer/printer/test_helper.h b/src/tint/lang/msl/writer/printer/helper_test.h
similarity index 91%
rename from src/tint/lang/msl/writer/printer/test_helper.h
rename to src/tint/lang/msl/writer/printer/helper_test.h
index 533a833..aaf7e15 100644
--- a/src/tint/lang/msl/writer/printer/test_helper.h
+++ b/src/tint/lang/msl/writer/printer/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_MSL_WRITER_PRINTER_TEST_HELPER_H_
-#define SRC_TINT_LANG_MSL_WRITER_PRINTER_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_MSL_WRITER_PRINTER_HELPER_TEST_H_
+#define SRC_TINT_LANG_MSL_WRITER_PRINTER_HELPER_TEST_H_
#include <iostream>
#include <string>
@@ -66,4 +66,4 @@
} // namespace tint::msl::writer
-#endif // SRC_TINT_LANG_MSL_WRITER_PRINTER_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_MSL_WRITER_PRINTER_HELPER_TEST_H_
diff --git a/src/tint/lang/msl/writer/printer/type_test.cc b/src/tint/lang/msl/writer/printer/type_test.cc
index 8b23008..69cdeaa 100644
--- a/src/tint/lang/msl/writer/printer/type_test.cc
+++ b/src/tint/lang/msl/writer/printer/type_test.cc
@@ -22,7 +22,7 @@
#include "src/tint/lang/core/type/sampled_texture.h"
#include "src/tint/lang/core/type/storage_texture.h"
#include "src/tint/lang/core/type/struct.h"
-#include "src/tint/lang/msl/writer/printer/test_helper.h"
+#include "src/tint/lang/msl/writer/printer/helper_test.h"
#include "src/tint/utils/text/string.h"
namespace tint::msl::writer {
diff --git a/src/tint/lang/spirv/reader/ast_parser/ast_parser_test.cc b/src/tint/lang/spirv/reader/ast_parser/ast_parser_test.cc
index 44fe192..0de2834 100644
--- a/src/tint/lang/spirv/reader/ast_parser/ast_parser_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/ast_parser_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/barrier_test.cc b/src/tint/lang/spirv/reader/ast_parser/barrier_test.cc
index 28e2e79..c13634a 100644
--- a/src/tint/lang/spirv/reader/ast_parser/barrier_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/barrier_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/sem/call.h"
diff --git a/src/tint/lang/spirv/reader/ast_parser/constant_test.cc b/src/tint/lang/spirv/reader/ast_parser/constant_test.cc
index 46b7bf8..d2cb3a9 100644
--- a/src/tint/lang/spirv/reader/ast_parser/constant_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/constant_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/convert_member_decoration_test.cc b/src/tint/lang/spirv/reader/ast_parser/convert_member_decoration_test.cc
index bda8264..965cdc1 100644
--- a/src/tint/lang/spirv/reader/ast_parser/convert_member_decoration_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/convert_member_decoration_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/convert_type_test.cc b/src/tint/lang/spirv/reader/ast_parser/convert_type_test.cc
index cdb1bdd..335ba00 100644
--- a/src/tint/lang/spirv/reader/ast_parser/convert_type_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/convert_type_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/function_arithmetic_test.cc b/src/tint/lang/spirv/reader/ast_parser/function_arithmetic_test.cc
index 4ba6734..4d991b0 100644
--- a/src/tint/lang/spirv/reader/ast_parser/function_arithmetic_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/function_arithmetic_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::spirv::reader {
diff --git a/src/tint/lang/spirv/reader/ast_parser/function_bit_test.cc b/src/tint/lang/spirv/reader/ast_parser/function_bit_test.cc
index 20690f7..502b19e 100644
--- a/src/tint/lang/spirv/reader/ast_parser/function_bit_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/function_bit_test.cc
@@ -13,8 +13,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::spirv::reader {
diff --git a/src/tint/lang/spirv/reader/ast_parser/function_call_test.cc b/src/tint/lang/spirv/reader/ast_parser/function_call_test.cc
index 7534fd7..526da22 100644
--- a/src/tint/lang/spirv/reader/ast_parser/function_call_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/function_call_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/function_cfg_test.cc b/src/tint/lang/spirv/reader/ast_parser/function_cfg_test.cc
index 336e886..60d31ce 100644
--- a/src/tint/lang/spirv/reader/ast_parser/function_cfg_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/function_cfg_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::spirv::reader {
diff --git a/src/tint/lang/spirv/reader/ast_parser/function_composite_test.cc b/src/tint/lang/spirv/reader/ast_parser/function_composite_test.cc
index ae11225..836e3da 100644
--- a/src/tint/lang/spirv/reader/ast_parser/function_composite_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/function_composite_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/function_conversion_test.cc b/src/tint/lang/spirv/reader/ast_parser/function_conversion_test.cc
index bbe0dc6..13b54ad 100644
--- a/src/tint/lang/spirv/reader/ast_parser/function_conversion_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/function_conversion_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/function_decl_test.cc b/src/tint/lang/spirv/reader/ast_parser/function_decl_test.cc
index 3f36fc8..2144885 100644
--- a/src/tint/lang/spirv/reader/ast_parser/function_decl_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/function_decl_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::spirv::reader {
diff --git a/src/tint/lang/spirv/reader/ast_parser/function_glsl_std_450_test.cc b/src/tint/lang/spirv/reader/ast_parser/function_glsl_std_450_test.cc
index 8f571e2..d1c595b 100644
--- a/src/tint/lang/spirv/reader/ast_parser/function_glsl_std_450_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/function_glsl_std_450_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/function_logical_test.cc b/src/tint/lang/spirv/reader/ast_parser/function_logical_test.cc
index 4e49cba..f1f3377 100644
--- a/src/tint/lang/spirv/reader/ast_parser/function_logical_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/function_logical_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::spirv::reader {
diff --git a/src/tint/lang/spirv/reader/ast_parser/function_memory_test.cc b/src/tint/lang/spirv/reader/ast_parser/function_memory_test.cc
index 9cf96d4..8068dd1 100644
--- a/src/tint/lang/spirv/reader/ast_parser/function_memory_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/function_memory_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/function_misc_test.cc b/src/tint/lang/spirv/reader/ast_parser/function_misc_test.cc
index 167941a..03800d0 100644
--- a/src/tint/lang/spirv/reader/ast_parser/function_misc_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/function_misc_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/function_var_test.cc b/src/tint/lang/spirv/reader/ast_parser/function_var_test.cc
index cce99eb..6b6d1cb 100644
--- a/src/tint/lang/spirv/reader/ast_parser/function_var_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/function_var_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::spirv::reader {
diff --git a/src/tint/lang/spirv/reader/ast_parser/get_decorations_test.cc b/src/tint/lang/spirv/reader/ast_parser/get_decorations_test.cc
index 1083750..66253c6 100644
--- a/src/tint/lang/spirv/reader/ast_parser/get_decorations_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/get_decorations_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/handle_test.cc b/src/tint/lang/spirv/reader/ast_parser/handle_test.cc
index ee5ec63..c2ff2da 100644
--- a/src/tint/lang/spirv/reader/ast_parser/handle_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/handle_test.cc
@@ -16,8 +16,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::spirv::reader {
diff --git a/src/tint/lang/spirv/reader/ast_parser/test_helper.cc b/src/tint/lang/spirv/reader/ast_parser/helper_test.cc
similarity index 97%
rename from src/tint/lang/spirv/reader/ast_parser/test_helper.cc
rename to src/tint/lang/spirv/reader/ast_parser/helper_test.cc
index 20a6e9d..bfb8eb1 100644
--- a/src/tint/lang/spirv/reader/ast_parser/test_helper.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/helper_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/wgsl/writer/ast_printer/ast_printer.h"
#include "src/tint/utils/rtti/switch.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/spirv/reader/ast_parser/test_helper.h b/src/tint/lang/spirv/reader/ast_parser/helper_test.h
similarity index 98%
rename from src/tint/lang/spirv/reader/ast_parser/test_helper.h
rename to src/tint/lang/spirv/reader/ast_parser/helper_test.h
index 1c9c056..356d8a6 100644
--- a/src/tint/lang/spirv/reader/ast_parser/test_helper.h
+++ b/src/tint/lang/spirv/reader/ast_parser/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_SPIRV_READER_AST_PARSER_TEST_HELPER_H_
-#define SRC_TINT_LANG_SPIRV_READER_AST_PARSER_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_SPIRV_READER_AST_PARSER_HELPER_TEST_H_
+#define SRC_TINT_LANG_SPIRV_READER_AST_PARSER_HELPER_TEST_H_
#include <memory>
#include <string>
@@ -311,4 +311,4 @@
} // namespace tint::spirv::reader
-#endif // SRC_TINT_LANG_SPIRV_READER_AST_PARSER_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_SPIRV_READER_AST_PARSER_HELPER_TEST_H_
diff --git a/src/tint/lang/spirv/reader/ast_parser/import_test.cc b/src/tint/lang/spirv/reader/ast_parser/import_test.cc
index 6dee3ef..8416e3f 100644
--- a/src/tint/lang/spirv/reader/ast_parser/import_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/import_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/module_function_decl_test.cc b/src/tint/lang/spirv/reader/ast_parser/module_function_decl_test.cc
index 6063569..c6db896 100644
--- a/src/tint/lang/spirv/reader/ast_parser/module_function_decl_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/module_function_decl_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::spirv::reader {
diff --git a/src/tint/lang/spirv/reader/ast_parser/module_var_test.cc b/src/tint/lang/spirv/reader/ast_parser/module_var_test.cc
index debaea3..7b70fe8 100644
--- a/src/tint/lang/spirv/reader/ast_parser/module_var_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/module_var_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "src/tint/lang/spirv/reader/ast_parser/function.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
#include "src/tint/utils/text/string.h"
namespace tint::spirv::reader {
diff --git a/src/tint/lang/spirv/reader/ast_parser/named_types_test.cc b/src/tint/lang/spirv/reader/ast_parser/named_types_test.cc
index 5ef9040..16b1fa5 100644
--- a/src/tint/lang/spirv/reader/ast_parser/named_types_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/named_types_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/reader/ast_parser/usage_test.cc b/src/tint/lang/spirv/reader/ast_parser/usage_test.cc
index 1c7babc..b073675 100644
--- a/src/tint/lang/spirv/reader/ast_parser/usage_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/usage_test.cc
@@ -16,7 +16,7 @@
#include <vector>
#include "gmock/gmock.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::spirv::reader {
diff --git a/src/tint/lang/spirv/reader/ast_parser/user_name_test.cc b/src/tint/lang/spirv/reader/ast_parser/user_name_test.cc
index 187ea27..f964787 100644
--- a/src/tint/lang/spirv/reader/ast_parser/user_name_test.cc
+++ b/src/tint/lang/spirv/reader/ast_parser/user_name_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/lang/spirv/reader/ast_parser/helper_test.h"
#include "src/tint/lang/spirv/reader/ast_parser/spirv_tools_helpers_test.h"
-#include "src/tint/lang/spirv/reader/ast_parser/test_helper.h"
namespace tint::spirv::reader {
namespace {
diff --git a/src/tint/lang/spirv/writer/access_test.cc b/src/tint/lang/spirv/writer/access_test.cc
index 4e1ad09..4e21fec9 100644
--- a/src/tint/lang/spirv/writer/access_test.cc
+++ b/src/tint/lang/spirv/writer/access_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
namespace tint::spirv::writer {
namespace {
diff --git a/src/tint/lang/spirv/writer/ast_printer/accessor_expression_test.cc b/src/tint/lang/spirv/writer/ast_printer/accessor_expression_test.cc
index db279db..c2e8090 100644
--- a/src/tint/lang/spirv/writer/ast_printer/accessor_expression_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/accessor_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
namespace tint::spirv::writer {
diff --git a/src/tint/lang/spirv/writer/ast_printer/assign_test.cc b/src/tint/lang/spirv/writer/ast_printer/assign_test.cc
index 546ae23..773e0a7 100644
--- a/src/tint/lang/spirv/writer/ast_printer/assign_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/assign_test.cc
@@ -14,7 +14,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
namespace tint::spirv::writer {
diff --git a/src/tint/lang/spirv/writer/ast_printer/ast_builtin_test.cc b/src/tint/lang/spirv/writer/ast_printer/ast_builtin_test.cc
index d964eb4..a9643cd 100644
--- a/src/tint/lang/spirv/writer/ast_printer/ast_builtin_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/ast_builtin_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/type/depth_texture.h"
#include "src/tint/lang/core/type/texture_dimension.h"
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
diff --git a/src/tint/lang/spirv/writer/ast_printer/ast_discard_test.cc b/src/tint/lang/spirv/writer/ast_printer/ast_discard_test.cc
index 29d249c..7e1b758 100644
--- a/src/tint/lang/spirv/writer/ast_printer/ast_discard_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/ast_discard_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
namespace tint::spirv::writer {
diff --git a/src/tint/lang/spirv/writer/ast_printer/ast_function_test.cc b/src/tint/lang/spirv/writer/ast_printer/ast_function_test.cc
index 2000d56..e2fc7e4 100644
--- a/src/tint/lang/spirv/writer/ast_printer/ast_function_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/ast_function_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
diff --git a/src/tint/lang/spirv/writer/ast_printer/ast_if_test.cc b/src/tint/lang/spirv/writer/ast_printer/ast_if_test.cc
index 7dc7ae3..db8f580 100644
--- a/src/tint/lang/spirv/writer/ast_printer/ast_if_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/ast_if_test.cc
@@ -14,7 +14,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/ast_printer/ast_loop_test.cc b/src/tint/lang/spirv/writer/ast_printer/ast_loop_test.cc
index d363c1f..202b04e 100644
--- a/src/tint/lang/spirv/writer/ast_printer/ast_loop_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/ast_loop_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/ast_printer/ast_printer_test.cc b/src/tint/lang/spirv/writer/ast_printer/ast_printer_test.cc
index 91b6a42..d0e99fb 100644
--- a/src/tint/lang/spirv/writer/ast_printer/ast_printer_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/ast_printer_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/writer.h"
namespace tint::spirv::writer {
diff --git a/src/tint/lang/spirv/writer/ast_printer/ast_switch_test.cc b/src/tint/lang/spirv/writer/ast_printer/ast_switch_test.cc
index 3e4b6ab..df5a650 100644
--- a/src/tint/lang/spirv/writer/ast_printer/ast_switch_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/ast_switch_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/ast_printer/ast_type_test.cc b/src/tint/lang/spirv/writer/ast_printer/ast_type_test.cc
index a5c05f4..cc173c6 100644
--- a/src/tint/lang/spirv/writer/ast_printer/ast_type_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/ast_type_test.cc
@@ -16,7 +16,7 @@
#include "src/tint/lang/core/type/multisampled_texture.h"
#include "src/tint/lang/core/type/sampled_texture.h"
#include "src/tint/lang/core/type/texture_dimension.h"
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/ast_printer/binary_expression_test.cc b/src/tint/lang/spirv/writer/ast_printer/binary_expression_test.cc
index 47444d4..f2560a8 100644
--- a/src/tint/lang/spirv/writer/ast_printer/binary_expression_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/binary_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
namespace tint::spirv::writer {
diff --git a/src/tint/lang/spirv/writer/ast_printer/bitcast_expression_test.cc b/src/tint/lang/spirv/writer/ast_printer/bitcast_expression_test.cc
index 9d56c5b..2dbcca8 100644
--- a/src/tint/lang/spirv/writer/ast_printer/bitcast_expression_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/bitcast_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/ast_printer/block_test.cc b/src/tint/lang/spirv/writer/ast_printer/block_test.cc
index f319151..fef6970 100644
--- a/src/tint/lang/spirv/writer/ast_printer/block_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/block_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/ast_printer/builtin_texture_test.cc b/src/tint/lang/spirv/writer/ast_printer/builtin_texture_test.cc
index 65cd155..bf7e42a 100644
--- a/src/tint/lang/spirv/writer/ast_printer/builtin_texture_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/builtin_texture_test.cc
@@ -14,7 +14,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
diff --git a/src/tint/lang/spirv/writer/ast_printer/call_test.cc b/src/tint/lang/spirv/writer/ast_printer/call_test.cc
index 4bddaac..2bebef5 100644
--- a/src/tint/lang/spirv/writer/ast_printer/call_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/call_test.cc
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
diff --git a/src/tint/lang/spirv/writer/ast_printer/const_assert_test.cc b/src/tint/lang/spirv/writer/ast_printer/const_assert_test.cc
index cb683e5..7ec84eb 100644
--- a/src/tint/lang/spirv/writer/ast_printer/const_assert_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/const_assert_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/ast_printer/constructor_expression_test.cc b/src/tint/lang/spirv/writer/ast_printer/constructor_expression_test.cc
index 906dcc5..92c6e88 100644
--- a/src/tint/lang/spirv/writer/ast_printer/constructor_expression_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/constructor_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
namespace tint::spirv::writer {
diff --git a/src/tint/lang/spirv/writer/ast_printer/entry_point_test.cc b/src/tint/lang/spirv/writer/ast_printer/entry_point_test.cc
index db15e29..11528be 100644
--- a/src/tint/lang/spirv/writer/ast_printer/entry_point_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/entry_point_test.cc
@@ -20,7 +20,7 @@
#include "src/tint/lang/core/type/f32.h"
#include "src/tint/lang/core/type/vector.h"
#include "src/tint/lang/spirv/writer/ast_printer/builder.h"
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
#include "src/tint/lang/wgsl/ast/builtin_attribute.h"
#include "src/tint/lang/wgsl/ast/location_attribute.h"
diff --git a/src/tint/lang/spirv/writer/ast_printer/format_conversion_test.cc b/src/tint/lang/spirv/writer/ast_printer/format_conversion_test.cc
index 2069c4b..73194d9 100644
--- a/src/tint/lang/spirv/writer/ast_printer/format_conversion_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/format_conversion_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
namespace tint::spirv::writer {
diff --git a/src/tint/lang/spirv/writer/ast_printer/function_attribute_test.cc b/src/tint/lang/spirv/writer/ast_printer/function_attribute_test.cc
index 1b7a151..8d3952f 100644
--- a/src/tint/lang/spirv/writer/ast_printer/function_attribute_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/function_attribute_test.cc
@@ -14,7 +14,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
diff --git a/src/tint/lang/spirv/writer/ast_printer/function_variable_test.cc b/src/tint/lang/spirv/writer/ast_printer/function_variable_test.cc
index 43697c2..2faa9d8 100644
--- a/src/tint/lang/spirv/writer/ast_printer/function_variable_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/function_variable_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
namespace tint::spirv::writer {
diff --git a/src/tint/lang/spirv/writer/ast_printer/global_variable_test.cc b/src/tint/lang/spirv/writer/ast_printer/global_variable_test.cc
index 8343142..01a263b 100644
--- a/src/tint/lang/spirv/writer/ast_printer/global_variable_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/global_variable_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/core/type/texture_dimension.h"
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
#include "src/tint/lang/wgsl/ast/id_attribute.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
diff --git a/src/tint/lang/spirv/writer/ast_printer/test_helper.h b/src/tint/lang/spirv/writer/ast_printer/helper_test.h
similarity index 96%
rename from src/tint/lang/spirv/writer/ast_printer/test_helper.h
rename to src/tint/lang/spirv/writer/ast_printer/helper_test.h
index ce3411f..cee975d 100644
--- a/src/tint/lang/spirv/writer/ast_printer/test_helper.h
+++ b/src/tint/lang/spirv/writer/ast_printer/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_SPIRV_WRITER_AST_PRINTER_TEST_HELPER_H_
-#define SRC_TINT_LANG_SPIRV_WRITER_AST_PRINTER_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_SPIRV_WRITER_AST_PRINTER_HELPER_TEST_H_
+#define SRC_TINT_LANG_SPIRV_WRITER_AST_PRINTER_HELPER_TEST_H_
#include <memory>
#include <string>
@@ -134,4 +134,4 @@
} // namespace tint::spirv::writer
-#endif // SRC_TINT_LANG_SPIRV_WRITER_AST_PRINTER_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_SPIRV_WRITER_AST_PRINTER_HELPER_TEST_H_
diff --git a/src/tint/lang/spirv/writer/ast_printer/ident_expression_test.cc b/src/tint/lang/spirv/writer/ast_printer/ident_expression_test.cc
index 94f2538..acd3424 100644
--- a/src/tint/lang/spirv/writer/ast_printer/ident_expression_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/ident_expression_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
namespace tint::spirv::writer {
diff --git a/src/tint/lang/spirv/writer/ast_printer/literal_test.cc b/src/tint/lang/spirv/writer/ast_printer/literal_test.cc
index 306f6ba..b4020a5 100644
--- a/src/tint/lang/spirv/writer/ast_printer/literal_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/literal_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/ast_printer/return_test.cc b/src/tint/lang/spirv/writer/ast_printer/return_test.cc
index e92d9a7..28c79be 100644
--- a/src/tint/lang/spirv/writer/ast_printer/return_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/return_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
namespace tint::spirv::writer {
diff --git a/src/tint/lang/spirv/writer/ast_printer/scalar_constant_test.cc b/src/tint/lang/spirv/writer/ast_printer/scalar_constant_test.cc
index 0314831..8fcd6b4 100644
--- a/src/tint/lang/spirv/writer/ast_printer/scalar_constant_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/scalar_constant_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/spirv/writer/ast_printer/scalar_constant.h"
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
namespace tint::spirv::writer {
namespace {
diff --git a/src/tint/lang/spirv/writer/ast_printer/unary_op_expression_test.cc b/src/tint/lang/spirv/writer/ast_printer/unary_op_expression_test.cc
index 31cdca9..a6aec1d 100644
--- a/src/tint/lang/spirv/writer/ast_printer/unary_op_expression_test.cc
+++ b/src/tint/lang/spirv/writer/ast_printer/unary_op_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/spirv/writer/ast_printer/helper_test.h"
#include "src/tint/lang/spirv/writer/common/spv_dump.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/atomic_builtin_test.cc b/src/tint/lang/spirv/writer/atomic_builtin_test.cc
index 2472199..8eee0d4 100644
--- a/src/tint/lang/spirv/writer/atomic_builtin_test.cc
+++ b/src/tint/lang/spirv/writer/atomic_builtin_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/core/type/builtin_structs.h"
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
#include "src/tint/lang/core/builtin/function.h"
diff --git a/src/tint/lang/spirv/writer/binary_test.cc b/src/tint/lang/spirv/writer/binary_test.cc
index 5876f3c..46c209e 100644
--- a/src/tint/lang/spirv/writer/binary_test.cc
+++ b/src/tint/lang/spirv/writer/binary_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
#include "src/tint/lang/core/ir/binary.h"
diff --git a/src/tint/lang/spirv/writer/bitcast_test.cc b/src/tint/lang/spirv/writer/bitcast_test.cc
index b5d1ba8..114ca18 100644
--- a/src/tint/lang/spirv/writer/bitcast_test.cc
+++ b/src/tint/lang/spirv/writer/bitcast_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
namespace tint::spirv::writer {
namespace {
diff --git a/src/tint/lang/spirv/writer/builtin_test.cc b/src/tint/lang/spirv/writer/builtin_test.cc
index 44798a2..4c2e95b 100644
--- a/src/tint/lang/spirv/writer/builtin_test.cc
+++ b/src/tint/lang/spirv/writer/builtin_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
#include "src/tint/lang/core/builtin/function.h"
#include "src/tint/lang/core/type/builtin_structs.h"
diff --git a/src/tint/lang/spirv/writer/common/test_helper.h b/src/tint/lang/spirv/writer/common/helper_test.h
similarity index 97%
rename from src/tint/lang/spirv/writer/common/test_helper.h
rename to src/tint/lang/spirv/writer/common/helper_test.h
index cd3d43c..0055a5c 100644
--- a/src/tint/lang/spirv/writer/common/test_helper.h
+++ b/src/tint/lang/spirv/writer/common/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_SPIRV_WRITER_COMMON_TEST_HELPER_H_
-#define SRC_TINT_LANG_SPIRV_WRITER_COMMON_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_SPIRV_WRITER_COMMON_HELPER_TEST_H_
+#define SRC_TINT_LANG_SPIRV_WRITER_COMMON_HELPER_TEST_H_
#include <string>
#include <utility>
@@ -243,4 +243,4 @@
} // namespace tint::spirv::writer
-#endif // SRC_TINT_LANG_SPIRV_WRITER_COMMON_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_SPIRV_WRITER_COMMON_HELPER_TEST_H_
diff --git a/src/tint/lang/spirv/writer/constant_test.cc b/src/tint/lang/spirv/writer/constant_test.cc
index 90ec6e9..0a37c0a 100644
--- a/src/tint/lang/spirv/writer/constant_test.cc
+++ b/src/tint/lang/spirv/writer/constant_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
namespace tint::spirv::writer {
namespace {
diff --git a/src/tint/lang/spirv/writer/construct_test.cc b/src/tint/lang/spirv/writer/construct_test.cc
index 545d491..913e170 100644
--- a/src/tint/lang/spirv/writer/construct_test.cc
+++ b/src/tint/lang/spirv/writer/construct_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
namespace tint::spirv::writer {
namespace {
diff --git a/src/tint/lang/spirv/writer/convert_test.cc b/src/tint/lang/spirv/writer/convert_test.cc
index d4f6377..17b7966 100644
--- a/src/tint/lang/spirv/writer/convert_test.cc
+++ b/src/tint/lang/spirv/writer/convert_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
namespace tint::spirv::writer {
namespace {
diff --git a/src/tint/lang/spirv/writer/discard_test.cc b/src/tint/lang/spirv/writer/discard_test.cc
index 286e4ba..512deae 100644
--- a/src/tint/lang/spirv/writer/discard_test.cc
+++ b/src/tint/lang/spirv/writer/discard_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
namespace tint::spirv::writer {
namespace {
diff --git a/src/tint/lang/spirv/writer/function_test.cc b/src/tint/lang/spirv/writer/function_test.cc
index c0fb632..7509909 100644
--- a/src/tint/lang/spirv/writer/function_test.cc
+++ b/src/tint/lang/spirv/writer/function_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
namespace tint::spirv::writer {
namespace {
diff --git a/src/tint/lang/spirv/writer/if_test.cc b/src/tint/lang/spirv/writer/if_test.cc
index 4de67d3..208888c 100644
--- a/src/tint/lang/spirv/writer/if_test.cc
+++ b/src/tint/lang/spirv/writer/if_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/let_test.cc b/src/tint/lang/spirv/writer/let_test.cc
index e9676d5..be27afb 100644
--- a/src/tint/lang/spirv/writer/let_test.cc
+++ b/src/tint/lang/spirv/writer/let_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
namespace tint::spirv::writer {
namespace {
diff --git a/src/tint/lang/spirv/writer/loop_test.cc b/src/tint/lang/spirv/writer/loop_test.cc
index b119cd2..6a31bfa 100644
--- a/src/tint/lang/spirv/writer/loop_test.cc
+++ b/src/tint/lang/spirv/writer/loop_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/switch_test.cc b/src/tint/lang/spirv/writer/switch_test.cc
index 755610e..7c694de 100644
--- a/src/tint/lang/spirv/writer/switch_test.cc
+++ b/src/tint/lang/spirv/writer/switch_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/swizzle_test.cc b/src/tint/lang/spirv/writer/swizzle_test.cc
index 8548f2a..76be348 100644
--- a/src/tint/lang/spirv/writer/swizzle_test.cc
+++ b/src/tint/lang/spirv/writer/swizzle_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
namespace tint::spirv::writer {
namespace {
diff --git a/src/tint/lang/spirv/writer/texture_builtin_test.cc b/src/tint/lang/spirv/writer/texture_builtin_test.cc
index 9e15bf2..7ff1426 100644
--- a/src/tint/lang/spirv/writer/texture_builtin_test.cc
+++ b/src/tint/lang/spirv/writer/texture_builtin_test.cc
@@ -12,10 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
-
#include "src/tint/lang/core/builtin/function.h"
#include "src/tint/lang/core/type/depth_multisampled_texture.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/type_test.cc b/src/tint/lang/spirv/writer/type_test.cc
index 44166d9..c75bc9f 100644
--- a/src/tint/lang/spirv/writer/type_test.cc
+++ b/src/tint/lang/spirv/writer/type_test.cc
@@ -24,7 +24,7 @@
#include "src/tint/lang/core/type/storage_texture.h"
#include "src/tint/lang/core/type/u32.h"
#include "src/tint/lang/core/type/void.h"
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
namespace tint::spirv::writer {
namespace {
diff --git a/src/tint/lang/spirv/writer/unary_test.cc b/src/tint/lang/spirv/writer/unary_test.cc
index 49cb077..1879ae8 100644
--- a/src/tint/lang/spirv/writer/unary_test.cc
+++ b/src/tint/lang/spirv/writer/unary_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
#include "src/tint/lang/core/ir/unary.h"
diff --git a/src/tint/lang/spirv/writer/var_test.cc b/src/tint/lang/spirv/writer/var_test.cc
index 5dd76ea..8025278 100644
--- a/src/tint/lang/spirv/writer/var_test.cc
+++ b/src/tint/lang/spirv/writer/var_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/type/pointer.h"
#include "src/tint/lang/core/type/sampled_texture.h"
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
namespace tint::spirv::writer {
namespace {
diff --git a/src/tint/lang/spirv/writer/writer_test.cc b/src/tint/lang/spirv/writer/writer_test.cc
index b1302af..9f1c54e 100644
--- a/src/tint/lang/spirv/writer/writer_test.cc
+++ b/src/tint/lang/spirv/writer/writer_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/common/test_helper.h"
+#include "src/tint/lang/spirv/writer/common/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/ast/alias_test.cc b/src/tint/lang/wgsl/ast/alias_test.cc
index d8d51ed..7252fd0 100644
--- a/src/tint/lang/wgsl/ast/alias_test.cc
+++ b/src/tint/lang/wgsl/ast/alias_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/alias.h"
#include "src/tint/lang/core/builtin/access.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/assignment_statement_test.cc b/src/tint/lang/wgsl/ast/assignment_statement_test.cc
index a839517..96ee03c 100644
--- a/src/tint/lang/wgsl/ast/assignment_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/assignment_statement_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/ast/binary_expression_test.cc b/src/tint/lang/wgsl/ast/binary_expression_test.cc
index fc645f8..2790786 100644
--- a/src/tint/lang/wgsl/ast/binary_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/binary_expression_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/binding_attribute_test.cc b/src/tint/lang/wgsl/ast/binding_attribute_test.cc
index 02f895c..471cd60 100644
--- a/src/tint/lang/wgsl/ast/binding_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/binding_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/bitcast_expression_test.cc b/src/tint/lang/wgsl/ast/bitcast_expression_test.cc
index 54bb99e..17ce839 100644
--- a/src/tint/lang/wgsl/ast/bitcast_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/bitcast_expression_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/block_statement_test.cc b/src/tint/lang/wgsl/ast/block_statement_test.cc
index 8fd9c61..3f8cefc 100644
--- a/src/tint/lang/wgsl/ast/block_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/block_statement_test.cc
@@ -15,8 +15,8 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/if_statement.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/bool_literal_expression_test.cc b/src/tint/lang/wgsl/ast/bool_literal_expression_test.cc
index 134bea9..676da57 100644
--- a/src/tint/lang/wgsl/ast/bool_literal_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/bool_literal_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/break_if_statement_test.cc b/src/tint/lang/wgsl/ast/break_if_statement_test.cc
index 9f68f64..857fd25 100644
--- a/src/tint/lang/wgsl/ast/break_if_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/break_if_statement_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/break_if_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/break_statement_test.cc b/src/tint/lang/wgsl/ast/break_statement_test.cc
index 324d53d..74c429f 100644
--- a/src/tint/lang/wgsl/ast/break_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/break_statement_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/break_statement.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/builtin_attribute_test.cc b/src/tint/lang/wgsl/ast/builtin_attribute_test.cc
index bd9e6f6..800a84e 100644
--- a/src/tint/lang/wgsl/ast/builtin_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/builtin_attribute_test.cc
@@ -15,7 +15,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/builtin/builtin_value.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/call_expression_test.cc b/src/tint/lang/wgsl/ast/call_expression_test.cc
index c80e582..ba99950 100644
--- a/src/tint/lang/wgsl/ast/call_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/call_expression_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/call_statement_test.cc b/src/tint/lang/wgsl/ast/call_statement_test.cc
index 72f0d6c..ff280e0 100644
--- a/src/tint/lang/wgsl/ast/call_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/call_statement_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/case_selector_test.cc b/src/tint/lang/wgsl/ast/case_selector_test.cc
index 9b5e36e..a865210 100644
--- a/src/tint/lang/wgsl/ast/case_selector_test.cc
+++ b/src/tint/lang/wgsl/ast/case_selector_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/case_selector.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/ast/case_statement_test.cc b/src/tint/lang/wgsl/ast/case_statement_test.cc
index 3a6aad7..6ab2e0c 100644
--- a/src/tint/lang/wgsl/ast/case_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/case_statement_test.cc
@@ -16,8 +16,8 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/if_statement.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/ast/compound_assignment_statement_test.cc b/src/tint/lang/wgsl/ast/compound_assignment_statement_test.cc
index 20f42d8..a018902 100644
--- a/src/tint/lang/wgsl/ast/compound_assignment_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/compound_assignment_statement_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/compound_assignment_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/ast/const_assert_test.cc b/src/tint/lang/wgsl/ast/const_assert_test.cc
index 703f47e..f99eafa 100644
--- a/src/tint/lang/wgsl/ast/const_assert_test.cc
+++ b/src/tint/lang/wgsl/ast/const_assert_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/const_assert.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/continue_statement_test.cc b/src/tint/lang/wgsl/ast/continue_statement_test.cc
index 6e9a1e7..a9a78d6 100644
--- a/src/tint/lang/wgsl/ast/continue_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/continue_statement_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/continue_statement.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/diagnostic_attribute_test.cc b/src/tint/lang/wgsl/ast/diagnostic_attribute_test.cc
index 49de81c..40b3729 100644
--- a/src/tint/lang/wgsl/ast/diagnostic_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/diagnostic_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/diagnostic_control_test.cc b/src/tint/lang/wgsl/ast/diagnostic_control_test.cc
index 32aa036..9232ffa 100644
--- a/src/tint/lang/wgsl/ast/diagnostic_control_test.cc
+++ b/src/tint/lang/wgsl/ast/diagnostic_control_test.cc
@@ -17,7 +17,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/builtin/diagnostic_severity.h"
#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/diagnostic_directive_test.cc b/src/tint/lang/wgsl/ast/diagnostic_directive_test.cc
index 009edb0..495967c 100644
--- a/src/tint/lang/wgsl/ast/diagnostic_directive_test.cc
+++ b/src/tint/lang/wgsl/ast/diagnostic_directive_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/diagnostic_directive.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/diagnostic_rule_name_test.cc b/src/tint/lang/wgsl/ast/diagnostic_rule_name_test.cc
index d7ebb69..06070a7 100644
--- a/src/tint/lang/wgsl/ast/diagnostic_rule_name_test.cc
+++ b/src/tint/lang/wgsl/ast/diagnostic_rule_name_test.cc
@@ -16,7 +16,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/wgsl/ast/diagnostic_rule_name.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/discard_statement_test.cc b/src/tint/lang/wgsl/ast/discard_statement_test.cc
index be926a9..8bb53f5 100644
--- a/src/tint/lang/wgsl/ast/discard_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/discard_statement_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/discard_statement.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/enable_test.cc b/src/tint/lang/wgsl/ast/enable_test.cc
index 61c7bbc..a3861c2 100644
--- a/src/tint/lang/wgsl/ast/enable_test.cc
+++ b/src/tint/lang/wgsl/ast/enable_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/enable.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/float_literal_expression_test.cc b/src/tint/lang/wgsl/ast/float_literal_expression_test.cc
index bdd5a4f..54d7ff3 100644
--- a/src/tint/lang/wgsl/ast/float_literal_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/float_literal_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/wgsl/ast/for_loop_statement_test.cc b/src/tint/lang/wgsl/ast/for_loop_statement_test.cc
index fc54053..f262ebf 100644
--- a/src/tint/lang/wgsl/ast/for_loop_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/for_loop_statement_test.cc
@@ -15,7 +15,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
#include "src/tint/lang/wgsl/ast/binary_expression.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/ast/function_test.cc b/src/tint/lang/wgsl/ast/function_test.cc
index c8d8864..e0f141b 100644
--- a/src/tint/lang/wgsl/ast/function_test.cc
+++ b/src/tint/lang/wgsl/ast/function_test.cc
@@ -14,8 +14,8 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/ast/group_attribute_test.cc b/src/tint/lang/wgsl/ast/group_attribute_test.cc
index ad5078a..c46a939 100644
--- a/src/tint/lang/wgsl/ast/group_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/group_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/test_helper_test.cc b/src/tint/lang/wgsl/ast/helper_test.cc
similarity index 96%
rename from src/tint/lang/wgsl/ast/test_helper_test.cc
rename to src/tint/lang/wgsl/ast/helper_test.cc
index 6f397f6..24a998f 100644
--- a/src/tint/lang/wgsl/ast/test_helper_test.cc
+++ b/src/tint/lang/wgsl/ast/helper_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/ast/test_helper.h b/src/tint/lang/wgsl/ast/helper_test.h
similarity index 97%
rename from src/tint/lang/wgsl/ast/test_helper.h
rename to src/tint/lang/wgsl/ast/helper_test.h
index 315b19c..d1efdc2 100644
--- a/src/tint/lang/wgsl/ast/test_helper.h
+++ b/src/tint/lang/wgsl/ast/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_WGSL_AST_TEST_HELPER_H_
-#define SRC_TINT_LANG_WGSL_AST_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_HELPER_TEST_H_
+#define SRC_TINT_LANG_WGSL_AST_HELPER_TEST_H_
#include <tuple>
#include <utility>
@@ -167,4 +167,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_LANG_WGSL_AST_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_WGSL_AST_HELPER_TEST_H_
diff --git a/src/tint/lang/wgsl/ast/id_attribute_test.cc b/src/tint/lang/wgsl/ast/id_attribute_test.cc
index ee4bb65..a20ed74 100644
--- a/src/tint/lang/wgsl/ast/id_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/id_attribute_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/id_attribute.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/identifier_expression_test.cc b/src/tint/lang/wgsl/ast/identifier_expression_test.cc
index a37f6c2..758966c 100644
--- a/src/tint/lang/wgsl/ast/identifier_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/identifier_expression_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/identifier_test.cc b/src/tint/lang/wgsl/ast/identifier_test.cc
index e1771d1..4d24f33 100644
--- a/src/tint/lang/wgsl/ast/identifier_test.cc
+++ b/src/tint/lang/wgsl/ast/identifier_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/if_statement_test.cc b/src/tint/lang/wgsl/ast/if_statement_test.cc
index 7790e04..2221c42 100644
--- a/src/tint/lang/wgsl/ast/if_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/if_statement_test.cc
@@ -17,7 +17,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
#include "src/tint/lang/wgsl/ast/discard_statement.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/increment_decrement_statement_test.cc b/src/tint/lang/wgsl/ast/increment_decrement_statement_test.cc
index d94ea9f..8d5d35b 100644
--- a/src/tint/lang/wgsl/ast/increment_decrement_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/increment_decrement_statement_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/increment_decrement_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/index_accessor_expression_test.cc b/src/tint/lang/wgsl/ast/index_accessor_expression_test.cc
index 649ec3f..f879631 100644
--- a/src/tint/lang/wgsl/ast/index_accessor_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/index_accessor_expression_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/index_attribute_test.cc b/src/tint/lang/wgsl/ast/index_attribute_test.cc
index 6c6bc6f..0756642 100644
--- a/src/tint/lang/wgsl/ast/index_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/index_attribute_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/id_attribute.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/int_literal_expression_test.cc b/src/tint/lang/wgsl/ast/int_literal_expression_test.cc
index a5a5214..bce4842 100644
--- a/src/tint/lang/wgsl/ast/int_literal_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/int_literal_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/wgsl/ast/interpolate_attribute_test.cc b/src/tint/lang/wgsl/ast/interpolate_attribute_test.cc
index 58efbe1..3df455f 100644
--- a/src/tint/lang/wgsl/ast/interpolate_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/interpolate_attribute_test.cc
@@ -16,7 +16,7 @@
#include <string>
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/utils/text/string.h"
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/ast/location_attribute_test.cc b/src/tint/lang/wgsl/ast/location_attribute_test.cc
index 122dd86..61b12df 100644
--- a/src/tint/lang/wgsl/ast/location_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/location_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/loop_statement_test.cc b/src/tint/lang/wgsl/ast/loop_statement_test.cc
index 786c86c..ab4b77e 100644
--- a/src/tint/lang/wgsl/ast/loop_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/loop_statement_test.cc
@@ -17,8 +17,8 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/if_statement.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/member_accessor_expression_test.cc b/src/tint/lang/wgsl/ast/member_accessor_expression_test.cc
index ab3dca9..1c497b1 100644
--- a/src/tint/lang/wgsl/ast/member_accessor_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/member_accessor_expression_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/module_test.cc b/src/tint/lang/wgsl/ast/module_test.cc
index 429af55..494b197 100644
--- a/src/tint/lang/wgsl/ast/module_test.cc
+++ b/src/tint/lang/wgsl/ast/module_test.cc
@@ -14,7 +14,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/program/clone_context.h"
#include "src/tint/lang/wgsl/resolver/resolve.h"
diff --git a/src/tint/lang/wgsl/ast/phony_expression_test.cc b/src/tint/lang/wgsl/ast/phony_expression_test.cc
index 099eada..34a1872 100644
--- a/src/tint/lang/wgsl/ast/phony_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/phony_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/return_statement_test.cc b/src/tint/lang/wgsl/ast/return_statement_test.cc
index b369a43..2bc1712 100644
--- a/src/tint/lang/wgsl/ast/return_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/return_statement_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/return_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/stage_attribute_test.cc b/src/tint/lang/wgsl/ast/stage_attribute_test.cc
index 1a81a55..0f7b7d2 100644
--- a/src/tint/lang/wgsl/ast/stage_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/stage_attribute_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/ast/stride_attribute_test.cc b/src/tint/lang/wgsl/ast/stride_attribute_test.cc
index 32a180c..d6a893b 100644
--- a/src/tint/lang/wgsl/ast/stride_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/stride_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/struct_member_align_attribute_test.cc b/src/tint/lang/wgsl/ast/struct_member_align_attribute_test.cc
index 8ef77f5..6a55ea8 100644
--- a/src/tint/lang/wgsl/ast/struct_member_align_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/struct_member_align_attribute_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/struct_member_align_attribute.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/struct_member_offset_attribute_test.cc b/src/tint/lang/wgsl/ast/struct_member_offset_attribute_test.cc
index bc665e7..725bb57 100644
--- a/src/tint/lang/wgsl/ast/struct_member_offset_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/struct_member_offset_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/struct_member_size_attribute_test.cc b/src/tint/lang/wgsl/ast/struct_member_size_attribute_test.cc
index f7f4c2c..02a1606 100644
--- a/src/tint/lang/wgsl/ast/struct_member_size_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/struct_member_size_attribute_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/struct_member_size_attribute.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/struct_member_test.cc b/src/tint/lang/wgsl/ast/struct_member_test.cc
index 80c1bf5..844b3a2 100644
--- a/src/tint/lang/wgsl/ast/struct_member_test.cc
+++ b/src/tint/lang/wgsl/ast/struct_member_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/struct_test.cc b/src/tint/lang/wgsl/ast/struct_test.cc
index edf66ac..8d74231 100644
--- a/src/tint/lang/wgsl/ast/struct_test.cc
+++ b/src/tint/lang/wgsl/ast/struct_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/struct.h"
#include "gtest/gtest-spi.h"
#include "src/tint/lang/wgsl/ast/alias.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/transform/add_block_attribute.h"
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/ast/switch_statement_test.cc b/src/tint/lang/wgsl/ast/switch_statement_test.cc
index eeb1b10..cc3463d 100644
--- a/src/tint/lang/wgsl/ast/switch_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/switch_statement_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/ast/templated_identifier_test.cc b/src/tint/lang/wgsl/ast/templated_identifier_test.cc
index 0431d66..fe1873d 100644
--- a/src/tint/lang/wgsl/ast/templated_identifier_test.cc
+++ b/src/tint/lang/wgsl/ast/templated_identifier_test.cc
@@ -14,7 +14,7 @@
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/add_block_attribute_test.cc b/src/tint/lang/wgsl/ast/transform/add_block_attribute_test.cc
index bc4126f..a9ec11e 100644
--- a/src/tint/lang/wgsl/ast/transform/add_block_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/add_block_attribute_test.cc
@@ -17,7 +17,7 @@
#include <memory>
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/add_empty_entry_point_test.cc b/src/tint/lang/wgsl/ast/transform/add_empty_entry_point_test.cc
index fb5e65b..7c06671 100644
--- a/src/tint/lang/wgsl/ast/transform/add_empty_entry_point_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/add_empty_entry_point_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/array_length_from_uniform_test.cc b/src/tint/lang/wgsl/ast/transform/array_length_from_uniform_test.cc
index 7ee04c3..54ff44c 100644
--- a/src/tint/lang/wgsl/ast/transform/array_length_from_uniform_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/array_length_from_uniform_test.cc
@@ -16,8 +16,8 @@
#include <utility>
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/binding_remapper_test.cc b/src/tint/lang/wgsl/ast/transform/binding_remapper_test.cc
index d0df03b..c97792a 100644
--- a/src/tint/lang/wgsl/ast/transform/binding_remapper_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/binding_remapper_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/builtin_polyfill_test.cc b/src/tint/lang/wgsl/ast/transform/builtin_polyfill_test.cc
index 46486d6..683a4df 100644
--- a/src/tint/lang/wgsl/ast/transform/builtin_polyfill_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/builtin_polyfill_test.cc
@@ -17,7 +17,7 @@
#include <utility>
#include "src/tint/lang/wgsl/ast/transform/direct_variable_access.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/calculate_array_length_test.cc b/src/tint/lang/wgsl/ast/transform/calculate_array_length_test.cc
index 38115a2..41f99cf 100644
--- a/src/tint/lang/wgsl/ast/transform/calculate_array_length_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/calculate_array_length_test.cc
@@ -14,8 +14,8 @@
#include "src/tint/lang/wgsl/ast/transform/calculate_array_length.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io_test.cc b/src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io_test.cc
index ce229cc..b924acd 100644
--- a/src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/clamp_frag_depth_test.cc b/src/tint/lang/wgsl/ast/transform/clamp_frag_depth_test.cc
index d2d567d..103f482 100644
--- a/src/tint/lang/wgsl/ast/transform/clamp_frag_depth_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/clamp_frag_depth_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/clamp_frag_depth.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/combine_samplers_test.cc b/src/tint/lang/wgsl/ast/transform/combine_samplers_test.cc
index eccb624..1d8afe5 100644
--- a/src/tint/lang/wgsl/ast/transform/combine_samplers_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/combine_samplers_test.cc
@@ -17,7 +17,7 @@
#include <memory>
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/decompose_memory_access_test.cc b/src/tint/lang/wgsl/ast/transform/decompose_memory_access_test.cc
index 8f77635..9d07277 100644
--- a/src/tint/lang/wgsl/ast/transform/decompose_memory_access_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/decompose_memory_access_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/decompose_memory_access.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/decompose_strided_array_test.cc b/src/tint/lang/wgsl/ast/transform/decompose_strided_array_test.cc
index 0f5ca80..1a19dd4 100644
--- a/src/tint/lang/wgsl/ast/transform/decompose_strided_array_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/decompose_strided_array_test.cc
@@ -18,8 +18,8 @@
#include <utility>
#include <vector>
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
#include "src/tint/lang/wgsl/program/clone_context.h"
#include "src/tint/lang/wgsl/program/program_builder.h"
diff --git a/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix_test.cc b/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix_test.cc
index b724f356..d0b0036 100644
--- a/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix_test.cc
@@ -19,8 +19,8 @@
#include <vector>
#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
#include "src/tint/lang/wgsl/program/clone_context.h"
#include "src/tint/lang/wgsl/program/program_builder.h"
diff --git a/src/tint/lang/wgsl/ast/transform/demote_to_helper_test.cc b/src/tint/lang/wgsl/ast/transform/demote_to_helper_test.cc
index 526895f..3bab5ee 100644
--- a/src/tint/lang/wgsl/ast/transform/demote_to_helper_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/demote_to_helper_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/direct_variable_access_test.cc b/src/tint/lang/wgsl/ast/transform/direct_variable_access_test.cc
index 56d4594..dd28114 100644
--- a/src/tint/lang/wgsl/ast/transform/direct_variable_access_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/direct_variable_access_test.cc
@@ -17,7 +17,7 @@
#include <memory>
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/utils/text/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis_test.cc b/src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis_test.cc
index 2791562..5fee8c3 100644
--- a/src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis_test.cc
@@ -17,7 +17,7 @@
#include <string>
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/expand_compound_assignment_test.cc b/src/tint/lang/wgsl/ast/transform/expand_compound_assignment_test.cc
index 0c2f880..8deb838 100644
--- a/src/tint/lang/wgsl/ast/transform/expand_compound_assignment_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/expand_compound_assignment_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/first_index_offset_test.cc b/src/tint/lang/wgsl/ast/transform/first_index_offset_test.cc
index 3ed9be2..da8b9fb 100644
--- a/src/tint/lang/wgsl/ast/transform/first_index_offset_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/first_index_offset_test.cc
@@ -18,7 +18,7 @@
#include <utility>
#include <vector>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/fold_trivial_lets_test.cc b/src/tint/lang/wgsl/ast/transform/fold_trivial_lets_test.cc
index 9d9357f..d5b266f 100644
--- a/src/tint/lang/wgsl/ast/transform/fold_trivial_lets_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/fold_trivial_lets_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/fold_trivial_lets.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/for_loop_to_loop_test.cc b/src/tint/lang/wgsl/ast/transform/for_loop_to_loop_test.cc
index 2beadb3..711089f 100644
--- a/src/tint/lang/wgsl/ast/transform/for_loop_to_loop_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/for_loop_to_loop_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/for_loop_to_loop.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/get_insertion_point_test.cc b/src/tint/lang/wgsl/ast/transform/get_insertion_point_test.cc
index e0b4f27..648c30a 100644
--- a/src/tint/lang/wgsl/ast/transform/get_insertion_point_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/get_insertion_point_test.cc
@@ -16,7 +16,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/wgsl/ast/transform/get_insertion_point.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/lang/wgsl/program/clone_context.h"
#include "src/tint/lang/wgsl/program/program_builder.h"
#include "src/tint/lang/wgsl/resolver/resolve.h"
diff --git a/src/tint/lang/wgsl/ast/transform/test_helper.h b/src/tint/lang/wgsl/ast/transform/helper_test.h
similarity index 96%
rename from src/tint/lang/wgsl/ast/transform/test_helper.h
rename to src/tint/lang/wgsl/ast/transform/helper_test.h
index 31bb6c3..3ca9c37 100644
--- a/src/tint/lang/wgsl/ast/transform/test_helper.h
+++ b/src/tint/lang/wgsl/ast/transform/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_TEST_HELPER_H_
-#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_HELPER_TEST_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_HELPER_TEST_H_
#include <memory>
#include <string>
@@ -162,4 +162,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_HELPER_TEST_H_
diff --git a/src/tint/lang/wgsl/ast/transform/hoist_to_decl_before_test.cc b/src/tint/lang/wgsl/ast/transform/hoist_to_decl_before_test.cc
index f75aba0..229003e 100644
--- a/src/tint/lang/wgsl/ast/transform/hoist_to_decl_before_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/hoist_to_decl_before_test.cc
@@ -15,8 +15,8 @@
#include <utility>
#include "gtest/gtest-spi.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/lang/wgsl/ast/transform/hoist_to_decl_before.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/lang/wgsl/program/clone_context.h"
#include "src/tint/lang/wgsl/program/program_builder.h"
#include "src/tint/lang/wgsl/resolver/resolve.h"
diff --git a/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment_test.cc b/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment_test.cc
index 268d85d..1ca28d1 100644
--- a/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment_test.cc
@@ -16,7 +16,7 @@
#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/merge_return_test.cc b/src/tint/lang/wgsl/ast/transform/merge_return_test.cc
index ad492e6..4d486bc 100644
--- a/src/tint/lang/wgsl/ast/transform/merge_return_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/merge_return_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param_test.cc b/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param_test.cc
index 2689bb0..70e3d91 100644
--- a/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture_test.cc b/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture_test.cc
index 41abd9a..fda9b8d 100644
--- a/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform_test.cc b/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform_test.cc
index 1c80590..a9651e0 100644
--- a/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform_test.cc
@@ -17,7 +17,7 @@
#include <utility>
#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/packed_vec3_test.cc b/src/tint/lang/wgsl/ast/transform/packed_vec3_test.cc
index 1db92d1..e78b513 100644
--- a/src/tint/lang/wgsl/ast/transform/packed_vec3_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/packed_vec3_test.cc
@@ -20,7 +20,7 @@
#include "src/tint/lang/core/type/array.h"
#include "src/tint/lang/wgsl/ast/module.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/lang/wgsl/program/program_builder.h"
#include "src/tint/lang/wgsl/resolver/resolve.h"
#include "src/tint/lang/wgsl/sem/struct.h"
diff --git a/src/tint/lang/wgsl/ast/transform/pad_structs_test.cc b/src/tint/lang/wgsl/ast/transform/pad_structs_test.cc
index 6c64906..212fad2 100644
--- a/src/tint/lang/wgsl/ast/transform/pad_structs_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/pad_structs_test.cc
@@ -17,7 +17,7 @@
#include <memory>
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/preserve_padding_test.cc b/src/tint/lang/wgsl/ast/transform/preserve_padding_test.cc
index 85919e1..1653ddf 100644
--- a/src/tint/lang/wgsl/ast/transform/preserve_padding_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/preserve_padding_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let_test.cc b/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let_test.cc
index 57c919c..54a5607 100644
--- a/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl_test.cc b/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl_test.cc
index 175a91e..2a716af 100644
--- a/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch_test.cc b/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch_test.cc
index ca7dc06..ea82a6c 100644
--- a/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/remove_phonies_test.cc b/src/tint/lang/wgsl/ast/transform/remove_phonies_test.cc
index 210dcda..48d7457 100644
--- a/src/tint/lang/wgsl/ast/transform/remove_phonies_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/remove_phonies_test.cc
@@ -18,7 +18,7 @@
#include <utility>
#include <vector>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements_test.cc b/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements_test.cc
index cc88c61..85ee0e0 100644
--- a/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/renamer_test.cc b/src/tint/lang/wgsl/ast/transform/renamer_test.cc
index d212dd6..eca1357 100644
--- a/src/tint/lang/wgsl/ast/transform/renamer_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/renamer_test.cc
@@ -21,7 +21,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/core/builtin/builtin.h"
#include "src/tint/lang/core/builtin/texel_format.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/utils/text/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/robustness_test.cc b/src/tint/lang/wgsl/ast/transform/robustness_test.cc
index d64ca8f..c2d3fce 100644
--- a/src/tint/lang/wgsl/ast/transform/robustness_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/robustness_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/robustness.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/simplify_pointers_test.cc b/src/tint/lang/wgsl/ast/transform/simplify_pointers_test.cc
index 7801548..1db9907 100644
--- a/src/tint/lang/wgsl/ast/transform/simplify_pointers_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/simplify_pointers_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/single_entry_point_test.cc b/src/tint/lang/wgsl/ast/transform/single_entry_point_test.cc
index a1fda51..9799627 100644
--- a/src/tint/lang/wgsl/ast/transform/single_entry_point_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/single_entry_point_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/spirv_atomic_test.cc b/src/tint/lang/wgsl/ast/transform/spirv_atomic_test.cc
index 40c9319..49369b8 100644
--- a/src/tint/lang/wgsl/ast/transform/spirv_atomic_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/spirv_atomic_test.cc
@@ -19,7 +19,7 @@
#include <utility>
#include <vector>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/lang/wgsl/reader/parser/parser.h"
#include "src/tint/lang/wgsl/resolver/resolve.h"
diff --git a/src/tint/lang/wgsl/ast/transform/std140_exhaustive_test.cc b/src/tint/lang/wgsl/ast/transform/std140_exhaustive_test.cc
index c9715af..680a871 100644
--- a/src/tint/lang/wgsl/ast/transform/std140_exhaustive_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140_exhaustive_test.cc
@@ -18,7 +18,7 @@
#include <utility>
#include <vector>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/utils/text/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/std140_f16_test.cc b/src/tint/lang/wgsl/ast/transform/std140_f16_test.cc
index 322d83b..2f0ea4e 100644
--- a/src/tint/lang/wgsl/ast/transform/std140_f16_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140_f16_test.cc
@@ -18,7 +18,7 @@
#include <utility>
#include <vector>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/utils/text/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/std140_f32_test.cc b/src/tint/lang/wgsl/ast/transform/std140_f32_test.cc
index ac57b11..b6a733f 100644
--- a/src/tint/lang/wgsl/ast/transform/std140_f32_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140_f32_test.cc
@@ -18,7 +18,7 @@
#include <utility>
#include <vector>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/utils/text/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/std140_test.cc b/src/tint/lang/wgsl/ast/transform/std140_test.cc
index 2549e97..392a23d 100644
--- a/src/tint/lang/wgsl/ast/transform/std140_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140_test.cc
@@ -18,7 +18,7 @@
#include <utility>
#include <vector>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/utils/text/string.h"
// This file contains the should-run tests and a trival empty module test for Std140 transform.
diff --git a/src/tint/lang/wgsl/ast/transform/substitute_override_test.cc b/src/tint/lang/wgsl/ast/transform/substitute_override_test.cc
index 9d27322..acd6399 100644
--- a/src/tint/lang/wgsl/ast/transform/substitute_override_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/substitute_override_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/substitute_override.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/texture_1d_to_2d_test.cc b/src/tint/lang/wgsl/ast/transform/texture_1d_to_2d_test.cc
index b6f81f4..cdddfbd 100644
--- a/src/tint/lang/wgsl/ast/transform/texture_1d_to_2d_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/texture_1d_to_2d_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/transform/texture_1d_to_2d.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/transform_test.cc b/src/tint/lang/wgsl/ast/transform/transform_test.cc
index 048d5c5..079b25b 100644
--- a/src/tint/lang/wgsl/ast/transform/transform_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/transform_test.cc
@@ -14,7 +14,7 @@
#include <string>
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/lang/wgsl/program/clone_context.h"
#include "src/tint/lang/wgsl/program/program_builder.h"
diff --git a/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables_test.cc b/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables_test.cc
index 76efbe0..8884792 100644
--- a/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables_test.cc
@@ -16,7 +16,7 @@
#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/unshadow_test.cc b/src/tint/lang/wgsl/ast/transform/unshadow_test.cc
index a87f6b7..65b7b73 100644
--- a/src/tint/lang/wgsl/ast/transform/unshadow_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/unshadow_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/var_for_dynamic_index_test.cc b/src/tint/lang/wgsl/ast/transform/var_for_dynamic_index_test.cc
index eaa15be..84a5d9b 100644
--- a/src/tint/lang/wgsl/ast/transform/var_for_dynamic_index_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/var_for_dynamic_index_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/transform/var_for_dynamic_index.h"
#include "src/tint/lang/wgsl/ast/transform/for_loop_to_loop.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc b/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc
index ac9d806..12a414e 100644
--- a/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc
@@ -17,7 +17,7 @@
#include <string>
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/utils/text/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc b/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc
index 14dc0d9..c08d113 100644
--- a/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc
@@ -17,7 +17,7 @@
#include <string>
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
#include "src/tint/utils/text/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/vertex_pulling_test.cc b/src/tint/lang/wgsl/ast/transform/vertex_pulling_test.cc
index ae67e9f..5bb7c59 100644
--- a/src/tint/lang/wgsl/ast/transform/vertex_pulling_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/vertex_pulling_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/while_to_loop_test.cc b/src/tint/lang/wgsl/ast/transform/while_to_loop_test.cc
index c8b5e46..fc84975 100644
--- a/src/tint/lang/wgsl/ast/transform/while_to_loop_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/while_to_loop_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/transform/while_to_loop.h"
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory_test.cc b/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory_test.cc
index 54a9854..2ea6da4 100644
--- a/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory_test.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/helper_test.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/traverse_expressions_test.cc b/src/tint/lang/wgsl/ast/traverse_expressions_test.cc
index 4f9d567..cfc4628 100644
--- a/src/tint/lang/wgsl/ast/traverse_expressions_test.cc
+++ b/src/tint/lang/wgsl/ast/traverse_expressions_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
using ::testing::ElementsAre;
diff --git a/src/tint/lang/wgsl/ast/unary_op_expression_test.cc b/src/tint/lang/wgsl/ast/unary_op_expression_test.cc
index b23a894..737fdc5 100644
--- a/src/tint/lang/wgsl/ast/unary_op_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/unary_op_expression_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/variable_decl_statement_test.cc b/src/tint/lang/wgsl/ast/variable_decl_statement_test.cc
index ae80f12..c453d2b 100644
--- a/src/tint/lang/wgsl/ast/variable_decl_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/variable_decl_statement_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/variable_test.cc b/src/tint/lang/wgsl/ast/variable_test.cc
index e010f30..b4c5edf 100644
--- a/src/tint/lang/wgsl/ast/variable_test.cc
+++ b/src/tint/lang/wgsl/ast/variable_test.cc
@@ -15,8 +15,8 @@
#include "gtest/gtest-spi.h"
#include "src/tint/lang/core/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/id_attribute.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/ast/while_statement_test.cc b/src/tint/lang/wgsl/ast/while_statement_test.cc
index c6508f9..3fb8dbe 100644
--- a/src/tint/lang/wgsl/ast/while_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/while_statement_test.cc
@@ -15,7 +15,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
#include "src/tint/lang/wgsl/ast/binary_expression.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/ast/workgroup_attribute_test.cc b/src/tint/lang/wgsl/ast/workgroup_attribute_test.cc
index 0dd8729..b93b3cc 100644
--- a/src/tint/lang/wgsl/ast/workgroup_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/workgroup_attribute_test.cc
@@ -14,8 +14,8 @@
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/helpers/append_vector_test.cc b/src/tint/lang/wgsl/helpers/append_vector_test.cc
index 3fa657b..b1b5438 100644
--- a/src/tint/lang/wgsl/helpers/append_vector_test.cc
+++ b/src/tint/lang/wgsl/helpers/append_vector_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/helpers/append_vector.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/program/program_builder.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "src/tint/lang/wgsl/sem/value_constructor.h"
diff --git a/src/tint/lang/wgsl/inspector/inspector_builder_test.cc b/src/tint/lang/wgsl/inspector/inspector_builder_test.cc
index 2c9d041..482808e 100644
--- a/src/tint/lang/wgsl/inspector/inspector_builder_test.cc
+++ b/src/tint/lang/wgsl/inspector/inspector_builder_test.cc
@@ -21,6 +21,7 @@
#include <vector>
#include "gtest/gtest.h"
+#include "src/tint/lang/wgsl/resolver/resolve.h"
namespace tint::inspector {
diff --git a/src/tint/lang/wgsl/inspector/test_inspector_builder.h b/src/tint/lang/wgsl/inspector/inspector_builder_test.h
similarity index 98%
rename from src/tint/lang/wgsl/inspector/test_inspector_builder.h
rename to src/tint/lang/wgsl/inspector/inspector_builder_test.h
index e22699b..663e17c 100644
--- a/src/tint/lang/wgsl/inspector/test_inspector_builder.h
+++ b/src/tint/lang/wgsl/inspector/inspector_builder_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_WGSL_INSPECTOR_TEST_INSPECTOR_BUILDER_H_
-#define SRC_TINT_LANG_WGSL_INSPECTOR_TEST_INSPECTOR_BUILDER_H_
+#ifndef SRC_TINT_LANG_WGSL_INSPECTOR_INSPECTOR_BUILDER_TEST_H_
+#define SRC_TINT_LANG_WGSL_INSPECTOR_INSPECTOR_BUILDER_TEST_H_
#include <memory>
#include <string>
@@ -333,4 +333,4 @@
} // namespace tint::inspector
-#endif // SRC_TINT_LANG_WGSL_INSPECTOR_TEST_INSPECTOR_BUILDER_H_
+#endif // SRC_TINT_LANG_WGSL_INSPECTOR_INSPECTOR_BUILDER_TEST_H_
diff --git a/src/tint/lang/wgsl/inspector/test_inspector_runner.cc b/src/tint/lang/wgsl/inspector/inspector_runner_test.cc
similarity index 94%
rename from src/tint/lang/wgsl/inspector/test_inspector_runner.cc
rename to src/tint/lang/wgsl/inspector/inspector_runner_test.cc
index 5f2754c..84a41f3 100644
--- a/src/tint/lang/wgsl/inspector/test_inspector_runner.cc
+++ b/src/tint/lang/wgsl/inspector/inspector_runner_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/inspector/test_inspector_runner.h"
+#include "src/tint/lang/wgsl/inspector/inspector_runner_test.h"
namespace tint::inspector {
diff --git a/src/tint/lang/wgsl/inspector/test_inspector_runner.h b/src/tint/lang/wgsl/inspector/inspector_runner_test.h
similarity index 88%
rename from src/tint/lang/wgsl/inspector/test_inspector_runner.h
rename to src/tint/lang/wgsl/inspector/inspector_runner_test.h
index 80dce6e..cdcb4d6 100644
--- a/src/tint/lang/wgsl/inspector/test_inspector_runner.h
+++ b/src/tint/lang/wgsl/inspector/inspector_runner_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_WGSL_INSPECTOR_TEST_INSPECTOR_RUNNER_H_
-#define SRC_TINT_LANG_WGSL_INSPECTOR_TEST_INSPECTOR_RUNNER_H_
+#ifndef SRC_TINT_LANG_WGSL_INSPECTOR_INSPECTOR_RUNNER_TEST_H_
+#define SRC_TINT_LANG_WGSL_INSPECTOR_INSPECTOR_RUNNER_TEST_H_
#include <memory>
#include <string>
@@ -46,4 +46,4 @@
} // namespace tint::inspector
-#endif // SRC_TINT_LANG_WGSL_INSPECTOR_TEST_INSPECTOR_RUNNER_H_
+#endif // SRC_TINT_LANG_WGSL_INSPECTOR_INSPECTOR_RUNNER_TEST_H_
diff --git a/src/tint/lang/wgsl/inspector/inspector_test.cc b/src/tint/lang/wgsl/inspector/inspector_test.cc
index a0b0cf9..9f2f30e 100644
--- a/src/tint/lang/wgsl/inspector/inspector_test.cc
+++ b/src/tint/lang/wgsl/inspector/inspector_test.cc
@@ -24,8 +24,8 @@
#include "src/tint/lang/wgsl/ast/id_attribute.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
-#include "src/tint/lang/wgsl/inspector/test_inspector_builder.h"
-#include "src/tint/lang/wgsl/inspector/test_inspector_runner.h"
+#include "src/tint/lang/wgsl/inspector/inspector_builder_test.h"
+#include "src/tint/lang/wgsl/inspector/inspector_runner_test.h"
#include "src/tint/lang/wgsl/program/program_builder.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "tint/tint.h"
diff --git a/src/tint/lang/wgsl/inspector/test_inspector_builder.cc b/src/tint/lang/wgsl/inspector/test_inspector_builder.cc
deleted file mode 100644
index 6ee260e..0000000
--- a/src/tint/lang/wgsl/inspector/test_inspector_builder.cc
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright 2021 The Tint Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/tint/lang/wgsl/inspector/test_inspector_builder.h"
-
-#include <memory>
-#include <string>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-#include "gtest/gtest.h"
-#include "src/tint/lang/wgsl/resolver/resolve.h"
-
-namespace tint::inspector {
-
-InspectorBuilder::InspectorBuilder() = default;
-InspectorBuilder::~InspectorBuilder() = default;
-
-void InspectorBuilder::MakeEmptyBodyFunction(std::string name,
- VectorRef<const ast::Attribute*> attributes) {
- Func(name, tint::Empty, ty.void_(), Vector{Return()}, attributes);
-}
-
-void InspectorBuilder::MakeCallerBodyFunction(std::string caller,
- VectorRef<std::string> callees,
- VectorRef<const ast::Attribute*> attributes) {
- Vector<const ast::Statement*, 8> body;
- body.Reserve(callees.Length() + 1);
- for (auto callee : callees) {
- body.Push(CallStmt(Call(callee)));
- }
- body.Push(Return());
-
- Func(caller, tint::Empty, ty.void_(), body, attributes);
-}
-
-const ast::Struct* InspectorBuilder::MakeInOutStruct(std::string name,
- VectorRef<InOutInfo> inout_vars) {
- Vector<const ast::StructMember*, 8> members;
- for (auto var : inout_vars) {
- std::string member_name;
- uint32_t location;
- std::tie(member_name, location) = var;
- members.Push(Member(member_name, ty.u32(),
- Vector{
- Location(AInt(location)),
- Flat(),
- }));
- }
- return Structure(name, members);
-}
-
-const ast::Function* InspectorBuilder::MakePlainGlobalReferenceBodyFunction(
- std::string func,
- std::string var,
- ast::Type type,
- VectorRef<const ast::Attribute*> attributes) {
- Vector<const ast::Statement*, 3> stmts;
- stmts.Push(Decl(Var("local_" + var, type)));
- stmts.Push(Assign("local_" + var, var));
- stmts.Push(Return());
- return Func(func, tint::Empty, ty.void_(), std::move(stmts), std::move(attributes));
-}
-
-bool InspectorBuilder::ContainsName(VectorRef<StageVariable> vec, const std::string& name) {
- for (auto& s : vec) {
- if (s.name == name) {
- return true;
- }
- }
- return false;
-}
-
-std::string InspectorBuilder::StructMemberName(size_t idx, ast::Type type) {
- return std::to_string(idx) + type->identifier->symbol.Name();
-}
-
-const ast::Struct* InspectorBuilder::MakeStructType(const std::string& name,
- VectorRef<ast::Type> member_types) {
- Vector<const ast::StructMember*, 8> members;
- for (auto type : member_types) {
- members.Push(MakeStructMember(members.Length(), type, {}));
- }
- return MakeStructTypeFromMembers(name, std::move(members));
-}
-
-const ast::Struct* InspectorBuilder::MakeStructTypeFromMembers(
- const std::string& name,
- VectorRef<const ast::StructMember*> members) {
- return Structure(name, std::move(members));
-}
-
-const ast::StructMember* InspectorBuilder::MakeStructMember(
- size_t index,
- ast::Type type,
- VectorRef<const ast::Attribute*> attributes) {
- return Member(StructMemberName(index, type), type, std::move(attributes));
-}
-
-const ast::Struct* InspectorBuilder::MakeUniformBufferType(const std::string& name,
- VectorRef<ast::Type> member_types) {
- return MakeStructType(name, member_types);
-}
-
-std::function<ast::Type()> InspectorBuilder::MakeStorageBufferTypes(
- const std::string& name,
- VectorRef<ast::Type> member_types) {
- MakeStructType(name, member_types);
- return [this, name] { return ty(name); };
-}
-
-void InspectorBuilder::AddUniformBuffer(const std::string& name,
- ast::Type type,
- uint32_t group,
- uint32_t binding) {
- GlobalVar(name, type, builtin::AddressSpace::kUniform, Binding(AInt(binding)),
- Group(AInt(group)));
-}
-
-void InspectorBuilder::AddWorkgroupStorage(const std::string& name, ast::Type type) {
- GlobalVar(name, type, builtin::AddressSpace::kWorkgroup);
-}
-
-void InspectorBuilder::AddStorageBuffer(const std::string& name,
- ast::Type type,
- builtin::Access access,
- uint32_t group,
- uint32_t binding) {
- GlobalVar(name, type, builtin::AddressSpace::kStorage, access, Binding(AInt(binding)),
- Group(AInt(group)));
-}
-
-void InspectorBuilder::MakeStructVariableReferenceBodyFunction(
- std::string func_name,
- std::string struct_name,
- VectorRef<std::tuple<size_t, ast::Type>> members) {
- Vector<const ast::Statement*, 8> stmts;
- for (auto member : members) {
- size_t member_idx;
- ast::Type member_type;
- std::tie(member_idx, member_type) = member;
- std::string member_name = StructMemberName(member_idx, member_type);
-
- stmts.Push(Decl(Var("local" + member_name, member_type)));
- }
-
- for (auto member : members) {
- size_t member_idx;
- ast::Type member_type;
- std::tie(member_idx, member_type) = member;
- std::string member_name = StructMemberName(member_idx, member_type);
-
- stmts.Push(Assign("local" + member_name, MemberAccessor(struct_name, member_name)));
- }
-
- stmts.Push(Return());
-
- Func(func_name, tint::Empty, ty.void_(), stmts);
-}
-
-void InspectorBuilder::AddSampler(const std::string& name, uint32_t group, uint32_t binding) {
- GlobalVar(name, ty.sampler(type::SamplerKind::kSampler), Binding(AInt(binding)),
- Group(AInt(group)));
-}
-
-void InspectorBuilder::AddComparisonSampler(const std::string& name,
- uint32_t group,
- uint32_t binding) {
- GlobalVar(name, ty.sampler(type::SamplerKind::kComparisonSampler), Binding(AInt(binding)),
- Group(AInt(group)));
-}
-
-void InspectorBuilder::AddResource(const std::string& name,
- ast::Type type,
- uint32_t group,
- uint32_t binding) {
- GlobalVar(name, type, Binding(AInt(binding)), Group(AInt(group)));
-}
-
-void InspectorBuilder::AddGlobalVariable(const std::string& name, ast::Type type) {
- GlobalVar(name, type, builtin::AddressSpace::kPrivate);
-}
-
-const ast::Function* InspectorBuilder::MakeSamplerReferenceBodyFunction(
- const std::string& func_name,
- const std::string& texture_name,
- const std::string& sampler_name,
- const std::string& coords_name,
- ast::Type base_type,
- VectorRef<const ast::Attribute*> attributes) {
- std::string result_name = "sampler_result";
-
- Vector stmts{
- Decl(Var(result_name, ty.vec(base_type, 4))),
- Assign(result_name, Call("textureSample", texture_name, sampler_name, coords_name)),
- Return(),
- };
- return Func(func_name, tint::Empty, ty.void_(), std::move(stmts), std::move(attributes));
-}
-
-const ast::Function* InspectorBuilder::MakeSamplerReferenceBodyFunction(
- const std::string& func_name,
- const std::string& texture_name,
- const std::string& sampler_name,
- const std::string& coords_name,
- const std::string& array_index,
- ast::Type base_type,
- VectorRef<const ast::Attribute*> attributes) {
- std::string result_name = "sampler_result";
-
- Vector stmts{
- Decl(Var("sampler_result", ty.vec(base_type, 4))),
- Assign("sampler_result",
- Call("textureSample", texture_name, sampler_name, coords_name, array_index)),
- Return(),
- };
- return Func(func_name, tint::Empty, ty.void_(), std::move(stmts), std::move(attributes));
-}
-
-const ast::Function* InspectorBuilder::MakeComparisonSamplerReferenceBodyFunction(
- const std::string& func_name,
- const std::string& texture_name,
- const std::string& sampler_name,
- const std::string& coords_name,
- const std::string& depth_name,
- ast::Type base_type,
- VectorRef<const ast::Attribute*> attributes) {
- std::string result_name = "sampler_result";
-
- Vector stmts{
- Decl(Var("sampler_result", base_type)),
- Assign("sampler_result",
- Call("textureSampleCompare", texture_name, sampler_name, coords_name, depth_name)),
- Return(),
- };
- return Func(func_name, tint::Empty, ty.void_(), std::move(stmts), std::move(attributes));
-}
-
-ast::Type InspectorBuilder::GetBaseType(ResourceBinding::SampledKind sampled_kind) {
- switch (sampled_kind) {
- case ResourceBinding::SampledKind::kFloat:
- return ty.f32();
- case ResourceBinding::SampledKind::kSInt:
- return ty.i32();
- case ResourceBinding::SampledKind::kUInt:
- return ty.u32();
- default:
- return ast::Type{};
- }
-}
-
-ast::Type InspectorBuilder::GetCoordsType(type::TextureDimension dim, ast::Type scalar) {
- switch (dim) {
- case type::TextureDimension::k1d:
- return scalar;
- case type::TextureDimension::k2d:
- case type::TextureDimension::k2dArray:
- return ty.vec2(scalar);
- case type::TextureDimension::k3d:
- case type::TextureDimension::kCube:
- case type::TextureDimension::kCubeArray:
- return ty.vec3(scalar);
- default:
- [=] {
- StringStream str;
- str << dim;
- FAIL() << "Unsupported texture dimension: " << str.str();
- }();
- }
- return ast::Type{};
-}
-
-ast::Type InspectorBuilder::MakeStorageTextureTypes(type::TextureDimension dim,
- builtin::TexelFormat format) {
- return ty.storage_texture(dim, format, builtin::Access::kWrite);
-}
-
-void InspectorBuilder::AddStorageTexture(const std::string& name,
- ast::Type type,
- uint32_t group,
- uint32_t binding) {
- GlobalVar(name, type, Binding(AInt(binding)), Group(AInt(group)));
-}
-
-const ast::Function* InspectorBuilder::MakeStorageTextureBodyFunction(
- const std::string& func_name,
- const std::string& st_name,
- ast::Type dim_type,
- VectorRef<const ast::Attribute*> attributes) {
- Vector stmts{
- Decl(Var("dim", dim_type)),
- Assign("dim", Call("textureDimensions", st_name)),
- Return(),
- };
-
- return Func(func_name, tint::Empty, ty.void_(), std::move(stmts), std::move(attributes));
-}
-
-std::function<ast::Type()> InspectorBuilder::GetTypeFunction(ComponentType component,
- CompositionType composition) {
- std::function<ast::Type()> func;
- switch (component) {
- case ComponentType::kF32:
- func = [this] { return ty.f32(); };
- break;
- case ComponentType::kI32:
- func = [this] { return ty.i32(); };
- break;
- case ComponentType::kU32:
- func = [this] { return ty.u32(); };
- break;
- case ComponentType::kF16:
- func = [this] { return ty.f16(); };
- break;
- case ComponentType::kUnknown:
- return [] { return ast::Type{}; };
- }
-
- uint32_t n;
- switch (composition) {
- case CompositionType::kScalar:
- return func;
- case CompositionType::kVec2:
- n = 2;
- break;
- case CompositionType::kVec3:
- n = 3;
- break;
- case CompositionType::kVec4:
- n = 4;
- break;
- default:
- return [] { return ast::Type{}; };
- }
-
- return [this, func, n] { return ty.vec(func(), n); };
-}
-
-Inspector& InspectorBuilder::Build() {
- if (inspector_) {
- return *inspector_;
- }
- program_ = std::make_unique<Program>(resolver::Resolve(*this));
- [&] { ASSERT_TRUE(program_->IsValid()) << program_->Diagnostics().str(); }();
- inspector_ = std::make_unique<Inspector>(program_.get());
- return *inspector_;
-}
-
-} // namespace tint::inspector
diff --git a/src/tint/lang/wgsl/program/program_test.cc b/src/tint/lang/wgsl/program/program_test.cc
index 6831282..a9028c4 100644
--- a/src/tint/lang/wgsl/program/program_test.cc
+++ b/src/tint/lang/wgsl/program/program_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/return_statement.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/additive_expression_test.cc b/src/tint/lang/wgsl/reader/parser/additive_expression_test.cc
index 5eb6c67..649d897 100644
--- a/src/tint/lang/wgsl/reader/parser/additive_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/additive_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/argument_expression_list_test.cc b/src/tint/lang/wgsl/reader/parser/argument_expression_list_test.cc
index b7342c8..0471561 100644
--- a/src/tint/lang/wgsl/reader/parser/argument_expression_list_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/argument_expression_list_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/assignment_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/assignment_stmt_test.cc
index b8cdd55..6a1f323 100644
--- a/src/tint/lang/wgsl/reader/parser/assignment_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/assignment_stmt_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/bitwise_expression_test.cc b/src/tint/lang/wgsl/reader/parser/bitwise_expression_test.cc
index 530c848..5ca42e3 100644
--- a/src/tint/lang/wgsl/reader/parser/bitwise_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/bitwise_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/break_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/break_stmt_test.cc
index 24a0815..13f1312 100644
--- a/src/tint/lang/wgsl/reader/parser/break_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/break_stmt_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/break_statement.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/bug_cases_test.cc b/src/tint/lang/wgsl/reader/parser/bug_cases_test.cc
index 0e883dc..5cf2df0 100644
--- a/src/tint/lang/wgsl/reader/parser/bug_cases_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/bug_cases_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/call_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/call_stmt_test.cc
index df7c632..2e6d822 100644
--- a/src/tint/lang/wgsl/reader/parser/call_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/call_stmt_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/call_statement.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/compound_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/compound_stmt_test.cc
index 474052c..cd3f4dd 100644
--- a/src/tint/lang/wgsl/reader/parser/compound_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/compound_stmt_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/discard_statement.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/const_literal_test.cc b/src/tint/lang/wgsl/reader/parser/const_literal_test.cc
index 33fe5fe..bd8fe02 100644
--- a/src/tint/lang/wgsl/reader/parser/const_literal_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/const_literal_test.cc
@@ -15,7 +15,7 @@
#include <cstring>
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/continue_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/continue_stmt_test.cc
index 4097807..05e5bee 100644
--- a/src/tint/lang/wgsl/reader/parser/continue_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/continue_stmt_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/continue_statement.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/continuing_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/continuing_stmt_test.cc
index bc244c2..6c53a0e 100644
--- a/src/tint/lang/wgsl/reader/parser/continuing_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/continuing_stmt_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/discard_statement.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/core_lhs_expression_test.cc b/src/tint/lang/wgsl/reader/parser/core_lhs_expression_test.cc
index 10825d1..f068bea 100644
--- a/src/tint/lang/wgsl/reader/parser/core_lhs_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/core_lhs_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/diagnostic_attribute_test.cc b/src/tint/lang/wgsl/reader/parser/diagnostic_attribute_test.cc
index 63f1628..67737f3 100644
--- a/src/tint/lang/wgsl/reader/parser/diagnostic_attribute_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/diagnostic_attribute_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/diagnostic_control_test.cc b/src/tint/lang/wgsl/reader/parser/diagnostic_control_test.cc
index bfe39aa..6d012eb 100644
--- a/src/tint/lang/wgsl/reader/parser/diagnostic_control_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/diagnostic_control_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/diagnostic_directive_test.cc b/src/tint/lang/wgsl/reader/parser/diagnostic_directive_test.cc
index 04e7965..e632742 100644
--- a/src/tint/lang/wgsl/reader/parser/diagnostic_directive_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/diagnostic_directive_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/enable_directive_test.cc b/src/tint/lang/wgsl/reader/parser/enable_directive_test.cc
index 964bb3b..d406496 100644
--- a/src/tint/lang/wgsl/reader/parser/enable_directive_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/enable_directive_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
#include "src/tint/lang/wgsl/ast/enable.h"
diff --git a/src/tint/lang/wgsl/reader/parser/error_msg_test.cc b/src/tint/lang/wgsl/reader/parser/error_msg_test.cc
index d200c8a..cd3e4dc 100644
--- a/src/tint/lang/wgsl/reader/parser/error_msg_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/error_msg_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/wgsl/reader/parser/error_resync_test.cc b/src/tint/lang/wgsl/reader/parser/error_resync_test.cc
index 847c7e4..a88a45b 100644
--- a/src/tint/lang/wgsl/reader/parser/error_resync_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/error_resync_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/expression_test.cc b/src/tint/lang/wgsl/reader/parser/expression_test.cc
index cf5ed2d..7f3d38f 100644
--- a/src/tint/lang/wgsl/reader/parser/expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/wgsl/reader/parser/for_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/for_stmt_test.cc
index d26dda0..5c060e3 100644
--- a/src/tint/lang/wgsl/reader/parser/for_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/for_stmt_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
#include "src/tint/lang/wgsl/ast/discard_statement.h"
diff --git a/src/tint/lang/wgsl/reader/parser/function_attribute_list_test.cc b/src/tint/lang/wgsl/reader/parser/function_attribute_list_test.cc
index 8d72776..b8e99d9 100644
--- a/src/tint/lang/wgsl/reader/parser/function_attribute_list_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/function_attribute_list_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/function_attribute_test.cc b/src/tint/lang/wgsl/reader/parser/function_attribute_test.cc
index a43d0c4..5866974 100644
--- a/src/tint/lang/wgsl/reader/parser/function_attribute_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/function_attribute_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/function_decl_test.cc b/src/tint/lang/wgsl/reader/parser/function_decl_test.cc
index 675b1b6..6823d03 100644
--- a/src/tint/lang/wgsl/reader/parser/function_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/function_decl_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
#include "src/tint/utils/text/string.h"
namespace tint::wgsl::reader {
diff --git a/src/tint/lang/wgsl/reader/parser/function_header_test.cc b/src/tint/lang/wgsl/reader/parser/function_header_test.cc
index e155ace..5f2df5a 100644
--- a/src/tint/lang/wgsl/reader/parser/function_header_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/function_header_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/global_constant_decl_test.cc b/src/tint/lang/wgsl/reader/parser/global_constant_decl_test.cc
index a2008e6..31f416e 100644
--- a/src/tint/lang/wgsl/reader/parser/global_constant_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/global_constant_decl_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/lang/wgsl/ast/helper_test.h"
#include "src/tint/lang/wgsl/ast/id_attribute.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/global_decl_test.cc b/src/tint/lang/wgsl/reader/parser/global_decl_test.cc
index 65a0368..ff9899a 100644
--- a/src/tint/lang/wgsl/reader/parser/global_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/global_decl_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/global_variable_decl_test.cc b/src/tint/lang/wgsl/reader/parser/global_variable_decl_test.cc
index bff7fb6..6baa050 100644
--- a/src/tint/lang/wgsl/reader/parser/global_variable_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/global_variable_decl_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/test_helper.cc b/src/tint/lang/wgsl/reader/parser/helper_test.cc
similarity index 92%
rename from src/tint/lang/wgsl/reader/parser/test_helper.cc
rename to src/tint/lang/wgsl/reader/parser/helper_test.cc
index 1f92adc..d4520cf 100644
--- a/src/tint/lang/wgsl/reader/parser/test_helper.cc
+++ b/src/tint/lang/wgsl/reader/parser/helper_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
diff --git a/src/tint/lang/wgsl/reader/parser/test_helper.h b/src/tint/lang/wgsl/reader/parser/helper_test.h
similarity index 92%
rename from src/tint/lang/wgsl/reader/parser/test_helper.h
rename to src/tint/lang/wgsl/reader/parser/helper_test.h
index 57958ec..cef7776 100644
--- a/src/tint/lang/wgsl/reader/parser/test_helper.h
+++ b/src/tint/lang/wgsl/reader/parser/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_WGSL_READER_PARSER_TEST_HELPER_H_
-#define SRC_TINT_LANG_WGSL_READER_PARSER_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_WGSL_READER_PARSER_HELPER_TEST_H_
+#define SRC_TINT_LANG_WGSL_READER_PARSER_HELPER_TEST_H_
#include <memory>
#include <string>
@@ -72,4 +72,4 @@
} // namespace tint::wgsl::reader
-#endif // SRC_TINT_LANG_WGSL_READER_PARSER_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_WGSL_READER_PARSER_HELPER_TEST_H_
diff --git a/src/tint/lang/wgsl/reader/parser/if_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/if_stmt_test.cc
index 39ee1fd..8cee0d88 100644
--- a/src/tint/lang/wgsl/reader/parser/if_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/if_stmt_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/increment_decrement_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/increment_decrement_stmt_test.cc
index a8fab2e..ee9118a 100644
--- a/src/tint/lang/wgsl/reader/parser/increment_decrement_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/increment_decrement_stmt_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/lhs_expression_test.cc b/src/tint/lang/wgsl/reader/parser/lhs_expression_test.cc
index 6e1e8cd..81ba464 100644
--- a/src/tint/lang/wgsl/reader/parser/lhs_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/lhs_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/loop_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/loop_stmt_test.cc
index 334bcc6..7d444f9 100644
--- a/src/tint/lang/wgsl/reader/parser/loop_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/loop_stmt_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/discard_statement.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/math_expression_test.cc b/src/tint/lang/wgsl/reader/parser/math_expression_test.cc
index 26d811d..036fa16 100644
--- a/src/tint/lang/wgsl/reader/parser/math_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/math_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/multiplicative_expression_test.cc b/src/tint/lang/wgsl/reader/parser/multiplicative_expression_test.cc
index f693563..baab807 100644
--- a/src/tint/lang/wgsl/reader/parser/multiplicative_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/multiplicative_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/param_list_test.cc b/src/tint/lang/wgsl/reader/parser/param_list_test.cc
index bc58a79..f4d7cf9 100644
--- a/src/tint/lang/wgsl/reader/parser/param_list_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/param_list_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/paren_expression_test.cc b/src/tint/lang/wgsl/reader/parser/paren_expression_test.cc
index f3b19d0..943e005 100644
--- a/src/tint/lang/wgsl/reader/parser/paren_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/paren_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/parser_test.cc b/src/tint/lang/wgsl/reader/parser/parser_test.cc
index 21b9389..92630ec 100644
--- a/src/tint/lang/wgsl/reader/parser/parser_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/parser_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/primary_expression_test.cc b/src/tint/lang/wgsl/reader/parser/primary_expression_test.cc
index b44af1e..87b38cf 100644
--- a/src/tint/lang/wgsl/reader/parser/primary_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/primary_expression_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/relational_expression_test.cc b/src/tint/lang/wgsl/reader/parser/relational_expression_test.cc
index 57b062b..9c4d2a2 100644
--- a/src/tint/lang/wgsl/reader/parser/relational_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/relational_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/require_directive_test.cc b/src/tint/lang/wgsl/reader/parser/require_directive_test.cc
index 261672a..6291368 100644
--- a/src/tint/lang/wgsl/reader/parser/require_directive_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/require_directive_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/reserved_keyword_test.cc b/src/tint/lang/wgsl/reader/parser/reserved_keyword_test.cc
index f233b1a..0bff7e3 100644
--- a/src/tint/lang/wgsl/reader/parser/reserved_keyword_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/reserved_keyword_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/shift_expression_test.cc b/src/tint/lang/wgsl/reader/parser/shift_expression_test.cc
index 311ab98..95c53f8 100644
--- a/src/tint/lang/wgsl/reader/parser/shift_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/shift_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/singular_expression_test.cc b/src/tint/lang/wgsl/reader/parser/singular_expression_test.cc
index 9087e2f..557e798 100644
--- a/src/tint/lang/wgsl/reader/parser/singular_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/singular_expression_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/statement_test.cc b/src/tint/lang/wgsl/reader/parser/statement_test.cc
index bdec111..9cd36bb 100644
--- a/src/tint/lang/wgsl/reader/parser/statement_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/statement_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/break_statement.h"
#include "src/tint/lang/wgsl/ast/continue_statement.h"
#include "src/tint/lang/wgsl/ast/discard_statement.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/statements_test.cc b/src/tint/lang/wgsl/reader/parser/statements_test.cc
index ea02bc7b..c91be6f 100644
--- a/src/tint/lang/wgsl/reader/parser/statements_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/statements_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/discard_statement.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/struct_attribute_decl_test.cc b/src/tint/lang/wgsl/reader/parser/struct_attribute_decl_test.cc
index d6a7284..be57b82 100644
--- a/src/tint/lang/wgsl/reader/parser/struct_attribute_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/struct_attribute_decl_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/invariant_attribute.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/struct_body_decl_test.cc b/src/tint/lang/wgsl/reader/parser/struct_body_decl_test.cc
index 8621bdf..2263ffe 100644
--- a/src/tint/lang/wgsl/reader/parser/struct_body_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/struct_body_decl_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/struct_decl_test.cc b/src/tint/lang/wgsl/reader/parser/struct_decl_test.cc
index 4d5690a..c325040 100644
--- a/src/tint/lang/wgsl/reader/parser/struct_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/struct_decl_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
#include "src/tint/utils/text/string.h"
namespace tint::wgsl::reader {
diff --git a/src/tint/lang/wgsl/reader/parser/struct_member_attribute_decl_test.cc b/src/tint/lang/wgsl/reader/parser/struct_member_attribute_decl_test.cc
index 1924172..30f5659 100644
--- a/src/tint/lang/wgsl/reader/parser/struct_member_attribute_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/struct_member_attribute_decl_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/struct_member_attribute_test.cc b/src/tint/lang/wgsl/reader/parser/struct_member_attribute_test.cc
index 7ba309d..c3cd0a0 100644
--- a/src/tint/lang/wgsl/reader/parser/struct_member_attribute_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/struct_member_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/struct_member_test.cc b/src/tint/lang/wgsl/reader/parser/struct_member_test.cc
index 535a08d..db02362 100644
--- a/src/tint/lang/wgsl/reader/parser/struct_member_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/struct_member_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/switch_body_test.cc b/src/tint/lang/wgsl/reader/parser/switch_body_test.cc
index 85623a3..1545e66 100644
--- a/src/tint/lang/wgsl/reader/parser/switch_body_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/switch_body_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/switch_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/switch_stmt_test.cc
index d8e97c3..a7804d7 100644
--- a/src/tint/lang/wgsl/reader/parser/switch_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/switch_stmt_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/type_alias_test.cc b/src/tint/lang/wgsl/reader/parser/type_alias_test.cc
index de66950..5ff18ba 100644
--- a/src/tint/lang/wgsl/reader/parser/type_alias_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/type_alias_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/type_decl_test.cc b/src/tint/lang/wgsl/reader/parser/type_decl_test.cc
index 3b7684c..ccaff08 100644
--- a/src/tint/lang/wgsl/reader/parser/type_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/type_decl_test.cc
@@ -14,8 +14,8 @@
#include "src/tint/lang/core/type/sampled_texture.h"
#include "src/tint/lang/wgsl/ast/alias.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/unary_expression_test.cc b/src/tint/lang/wgsl/reader/parser/unary_expression_test.cc
index 6877572..811588c 100644
--- a/src/tint/lang/wgsl/reader/parser/unary_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/unary_expression_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/variable_attribute_list_test.cc b/src/tint/lang/wgsl/reader/parser/variable_attribute_list_test.cc
index 9e96959..5a89202 100644
--- a/src/tint/lang/wgsl/reader/parser/variable_attribute_list_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/variable_attribute_list_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/variable_attribute_test.cc b/src/tint/lang/wgsl/reader/parser/variable_attribute_test.cc
index 7fe3138..2c9940a 100644
--- a/src/tint/lang/wgsl/reader/parser/variable_attribute_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/variable_attribute_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "src/tint/lang/core/builtin/builtin_value.h"
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/variable_decl_test.cc b/src/tint/lang/wgsl/reader/parser/variable_decl_test.cc
index 70e7c31..eb24e8d 100644
--- a/src/tint/lang/wgsl/reader/parser/variable_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/variable_decl_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/variable_ident_decl_test.cc b/src/tint/lang/wgsl/reader/parser/variable_ident_decl_test.cc
index 245b28e..42eec46 100644
--- a/src/tint/lang/wgsl/reader/parser/variable_ident_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/variable_ident_decl_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/variable_qualifier_test.cc b/src/tint/lang/wgsl/reader/parser/variable_qualifier_test.cc
index 95706c2..a7f7b94 100644
--- a/src/tint/lang/wgsl/reader/parser/variable_qualifier_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/variable_qualifier_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/variable_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/variable_stmt_test.cc
index 3db2df1..03c5ffc 100644
--- a/src/tint/lang/wgsl/reader/parser/variable_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/variable_stmt_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/ast/helper_test.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
namespace tint::wgsl::reader {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser/while_stmt_test.cc b/src/tint/lang/wgsl/reader/parser/while_stmt_test.cc
index ffda977..c3d34fa 100644
--- a/src/tint/lang/wgsl/reader/parser/while_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser/while_stmt_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/reader/parser/test_helper.h"
+#include "src/tint/lang/wgsl/reader/parser/helper_test.h"
#include "src/tint/lang/wgsl/ast/discard_statement.h"
diff --git a/src/tint/lang/wgsl/resolver/address_space_layout_validation_test.cc b/src/tint/lang/wgsl/resolver/address_space_layout_validation_test.cc
index 361232e..6951310 100644
--- a/src/tint/lang/wgsl/resolver/address_space_layout_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/address_space_layout_validation_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/resolver/address_space_validation_test.cc b/src/tint/lang/wgsl/resolver/address_space_validation_test.cc
index 826507e..cfb573d 100644
--- a/src/tint/lang/wgsl/resolver/address_space_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/address_space_validation_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/struct.h"
namespace tint::resolver {
diff --git a/src/tint/lang/wgsl/resolver/alias_analysis_test.cc b/src/tint/lang/wgsl/resolver/alias_analysis_test.cc
index d0826b9..80ec1e6 100644
--- a/src/tint/lang/wgsl/resolver/alias_analysis_test.cc
+++ b/src/tint/lang/wgsl/resolver/alias_analysis_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/array_accessor_test.cc b/src/tint/lang/wgsl/resolver/array_accessor_test.cc
index bc42921..6575a26 100644
--- a/src/tint/lang/wgsl/resolver/array_accessor_test.cc
+++ b/src/tint/lang/wgsl/resolver/array_accessor_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/core/type/reference.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/index_accessor_expression.h"
namespace tint::resolver {
diff --git a/src/tint/lang/wgsl/resolver/assignment_validation_test.cc b/src/tint/lang/wgsl/resolver/assignment_validation_test.cc
index 8e991d6..2df6987 100644
--- a/src/tint/lang/wgsl/resolver/assignment_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/assignment_validation_test.cc
@@ -17,7 +17,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/core/type/storage_texture.h"
#include "src/tint/lang/core/type/texture_dimension.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/resolver/atomics_test.cc b/src/tint/lang/wgsl/resolver/atomics_test.cc
index 798bedf..4209ada 100644
--- a/src/tint/lang/wgsl/resolver/atomics_test.cc
+++ b/src/tint/lang/wgsl/resolver/atomics_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/core/type/atomic.h"
#include "src/tint/lang/core/type/reference.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/atomics_validation_test.cc b/src/tint/lang/wgsl/resolver/atomics_validation_test.cc
index 859d614..130b2ad 100644
--- a/src/tint/lang/wgsl/resolver/atomics_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/atomics_validation_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/core/type/atomic.h"
#include "src/tint/lang/core/type/reference.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/attribute_validation_test.cc b/src/tint/lang/wgsl/resolver/attribute_validation_test.cc
index f14107b..329ff8c 100644
--- a/src/tint/lang/wgsl/resolver/attribute_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/attribute_validation_test.cc
@@ -17,7 +17,7 @@
#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
#include "src/tint/lang/wgsl/ast/transform/add_block_attribute.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/bitcast_validation_test.cc b/src/tint/lang/wgsl/resolver/bitcast_validation_test.cc
index 9b2842d..9a5b2e0 100644
--- a/src/tint/lang/wgsl/resolver/bitcast_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/bitcast_validation_test.cc
@@ -16,7 +16,7 @@
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/builtin_enum_test.cc b/src/tint/lang/wgsl/resolver/builtin_enum_test.cc
index e6bcbf0..58a38a4 100644
--- a/src/tint/lang/wgsl/resolver/builtin_enum_test.cc
+++ b/src/tint/lang/wgsl/resolver/builtin_enum_test.cc
@@ -19,7 +19,7 @@
#include "src/tint/lang/core/builtin/interpolation_type.h"
#include "src/tint/lang/core/builtin/texel_format.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/builtin_structs_test.cc b/src/tint/lang/wgsl/resolver/builtin_structs_test.cc
index 1ff6787..9e2198c 100644
--- a/src/tint/lang/wgsl/resolver/builtin_structs_test.cc
+++ b/src/tint/lang/wgsl/resolver/builtin_structs_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/builtin_test.cc b/src/tint/lang/wgsl/resolver/builtin_test.cc
index 0ccd6e9..2aaf830 100644
--- a/src/tint/lang/wgsl/resolver/builtin_test.cc
+++ b/src/tint/lang/wgsl/resolver/builtin_test.cc
@@ -15,8 +15,8 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "gmock/gmock.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/sampled_texture.h"
-#include "src/tint/lang/core/type/test_helper.h"
#include "src/tint/lang/core/type/texture_dimension.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
@@ -31,7 +31,7 @@
#include "src/tint/lang/wgsl/ast/switch_statement.h"
#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/lang/wgsl/sem/function.h"
#include "src/tint/lang/wgsl/sem/member_accessor_expression.h"
diff --git a/src/tint/lang/wgsl/resolver/builtin_validation_test.cc b/src/tint/lang/wgsl/resolver/builtin_validation_test.cc
index 97a4724..06b3cfe 100644
--- a/src/tint/lang/wgsl/resolver/builtin_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/builtin_validation_test.cc
@@ -15,7 +15,7 @@
#include <unordered_set>
#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/value_constructor.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/wgsl/resolver/builtins_validation_test.cc b/src/tint/lang/wgsl/resolver/builtins_validation_test.cc
index d1cf4f9..5d9e9b7 100644
--- a/src/tint/lang/wgsl/resolver/builtins_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/builtins_validation_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/builtin/builtin_value.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::resolver {
diff --git a/src/tint/lang/wgsl/resolver/call_test.cc b/src/tint/lang/wgsl/resolver/call_test.cc
index aae5181..7f6fff9 100644
--- a/src/tint/lang/wgsl/resolver/call_test.cc
+++ b/src/tint/lang/wgsl/resolver/call_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/resolver/call_validation_test.cc b/src/tint/lang/wgsl/resolver/call_validation_test.cc
index ba273e5..5d691ba 100644
--- a/src/tint/lang/wgsl/resolver/call_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/call_validation_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/resolver/compound_assignment_validation_test.cc b/src/tint/lang/wgsl/resolver/compound_assignment_validation_test.cc
index 76494ce..6e3971e 100644
--- a/src/tint/lang/wgsl/resolver/compound_assignment_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/compound_assignment_validation_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/core/type/storage_texture.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/resolver/compound_statement_test.cc b/src/tint/lang/wgsl/resolver/compound_statement_test.cc
index e0c5100..2c27a50 100644
--- a/src/tint/lang/wgsl/resolver/compound_statement_test.cc
+++ b/src/tint/lang/wgsl/resolver/compound_statement_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/block_statement.h"
#include "src/tint/lang/wgsl/sem/for_loop_statement.h"
#include "src/tint/lang/wgsl/sem/if_statement.h"
diff --git a/src/tint/lang/wgsl/resolver/const_assert_test.cc b/src/tint/lang/wgsl/resolver/const_assert_test.cc
index 2aeaa25..4aa0b1c 100644
--- a/src/tint/lang/wgsl/resolver/const_assert_test.cc
+++ b/src/tint/lang/wgsl/resolver/const_assert_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/resolver/const_eval_test.h b/src/tint/lang/wgsl/resolver/const_eval_test.h
index 78adadc..36140b0 100644
--- a/src/tint/lang/wgsl/resolver/const_eval_test.h
+++ b/src/tint/lang/wgsl/resolver/const_eval_test.h
@@ -22,8 +22,8 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "src/tint/lang/core/type/test_helper.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/utils/rtti/switch.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/wgsl/resolver/control_block_validation_test.cc b/src/tint/lang/wgsl/resolver/control_block_validation_test.cc
index f0a7d4d..638a079c 100644
--- a/src/tint/lang/wgsl/resolver/control_block_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/control_block_validation_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/ast/break_statement.h"
#include "src/tint/lang/wgsl/ast/continue_statement.h"
#include "src/tint/lang/wgsl/ast/switch_statement.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/resolver/dependency_graph_test.cc b/src/tint/lang/wgsl/resolver/dependency_graph_test.cc
index 2c49fc6..7c13275 100644
--- a/src/tint/lang/wgsl/resolver/dependency_graph_test.cc
+++ b/src/tint/lang/wgsl/resolver/dependency_graph_test.cc
@@ -20,7 +20,7 @@
#include "src/tint/lang/core/builtin/address_space.h"
#include "src/tint/lang/core/type/texture_dimension.h"
#include "src/tint/lang/wgsl/resolver/dependency_graph.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/utils/containers/transform.h"
namespace tint::resolver {
diff --git a/src/tint/lang/wgsl/resolver/diagnostic_control_test.cc b/src/tint/lang/wgsl/resolver/diagnostic_control_test.cc
index e77bde1..a88fac2 100644
--- a/src/tint/lang/wgsl/resolver/diagnostic_control_test.cc
+++ b/src/tint/lang/wgsl/resolver/diagnostic_control_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/resolver/dual_source_blending_extension_test.cc b/src/tint/lang/wgsl/resolver/dual_source_blending_extension_test.cc
index 05aec9f..ea04a85 100644
--- a/src/tint/lang/wgsl/resolver/dual_source_blending_extension_test.cc
+++ b/src/tint/lang/wgsl/resolver/dual_source_blending_extension_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/entry_point_validation_test.cc b/src/tint/lang/wgsl/resolver/entry_point_validation_test.cc
index 575572a..b0ded9b 100644
--- a/src/tint/lang/wgsl/resolver/entry_point_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/entry_point_validation_test.cc
@@ -18,7 +18,7 @@
#include "src/tint/lang/wgsl/ast/return_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/evaluation_stage_test.cc b/src/tint/lang/wgsl/resolver/evaluation_stage_test.cc
index e83eb7b..365d940 100644
--- a/src/tint/lang/wgsl/resolver/evaluation_stage_test.cc
+++ b/src/tint/lang/wgsl/resolver/evaluation_stage_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/resolver/expression_kind_test.cc b/src/tint/lang/wgsl/resolver/expression_kind_test.cc
index 68a258e..089e375 100644
--- a/src/tint/lang/wgsl/resolver/expression_kind_test.cc
+++ b/src/tint/lang/wgsl/resolver/expression_kind_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/resolver/f16_extension_test.cc b/src/tint/lang/wgsl/resolver/f16_extension_test.cc
index c3bfcb5..96895a6 100644
--- a/src/tint/lang/wgsl/resolver/f16_extension_test.cc
+++ b/src/tint/lang/wgsl/resolver/f16_extension_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/function_validation_test.cc b/src/tint/lang/wgsl/resolver/function_validation_test.cc
index 6821533..69b395e 100644
--- a/src/tint/lang/wgsl/resolver/function_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/function_validation_test.cc
@@ -17,7 +17,7 @@
#include "src/tint/lang/wgsl/ast/return_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/host_shareable_validation_test.cc b/src/tint/lang/wgsl/resolver/host_shareable_validation_test.cc
index 7f43830..5eb2229 100644
--- a/src/tint/lang/wgsl/resolver/host_shareable_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/host_shareable_validation_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/struct.h"
namespace tint::resolver {
diff --git a/src/tint/lang/wgsl/resolver/increment_decrement_validation_test.cc b/src/tint/lang/wgsl/resolver/increment_decrement_validation_test.cc
index 70d2aab..8ad24b2 100644
--- a/src/tint/lang/wgsl/resolver/increment_decrement_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/increment_decrement_validation_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/resolver/inferred_type_test.cc b/src/tint/lang/wgsl/resolver/inferred_type_test.cc
index 5f67305..8cd7acf 100644
--- a/src/tint/lang/wgsl/resolver/inferred_type_test.cc
+++ b/src/tint/lang/wgsl/resolver/inferred_type_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/intrinsic_table_test.cc b/src/tint/lang/wgsl/resolver/intrinsic_table_test.cc
index fbfe9b7..5d33c53 100644
--- a/src/tint/lang/wgsl/resolver/intrinsic_table_test.cc
+++ b/src/tint/lang/wgsl/resolver/intrinsic_table_test.cc
@@ -21,14 +21,14 @@
#include "src/tint/lang/core/type/depth_multisampled_texture.h"
#include "src/tint/lang/core/type/depth_texture.h"
#include "src/tint/lang/core/type/external_texture.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/core/type/multisampled_texture.h"
#include "src/tint/lang/core/type/reference.h"
#include "src/tint/lang/core/type/sampled_texture.h"
#include "src/tint/lang/core/type/storage_texture.h"
-#include "src/tint/lang/core/type/test_helper.h"
#include "src/tint/lang/core/type/texture_dimension.h"
#include "src/tint/lang/wgsl/program/program_builder.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/value_constructor.h"
#include "src/tint/lang/wgsl/sem/value_conversion.h"
diff --git a/src/tint/lang/wgsl/resolver/is_host_shareable_test.cc b/src/tint/lang/wgsl/resolver/is_host_shareable_test.cc
index a240b29..9de9324 100644
--- a/src/tint/lang/wgsl/resolver/is_host_shareable_test.cc
+++ b/src/tint/lang/wgsl/resolver/is_host_shareable_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/core/type/atomic.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/resolver/is_storeable_test.cc b/src/tint/lang/wgsl/resolver/is_storeable_test.cc
index 348514a..3a5af21 100644
--- a/src/tint/lang/wgsl/resolver/is_storeable_test.cc
+++ b/src/tint/lang/wgsl/resolver/is_storeable_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/core/type/atomic.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
using namespace tint::builtin::fluent_types; // NOLINT
diff --git a/src/tint/lang/wgsl/resolver/load_test.cc b/src/tint/lang/wgsl/resolver/load_test.cc
index 137a32e..6be167b3 100644
--- a/src/tint/lang/wgsl/resolver/load_test.cc
+++ b/src/tint/lang/wgsl/resolver/load_test.cc
@@ -17,8 +17,8 @@
#include "src/tint/lang/core/type/reference.h"
#include "src/tint/lang/core/type/texture_dimension.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
-#include "src/tint/lang/wgsl/sem/test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
+#include "src/tint/lang/wgsl/sem/helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/resolver/materialize_test.cc b/src/tint/lang/wgsl/resolver/materialize_test.cc
index bdd0c70..8d8e7c8 100644
--- a/src/tint/lang/wgsl/resolver/materialize_test.cc
+++ b/src/tint/lang/wgsl/resolver/materialize_test.cc
@@ -14,9 +14,9 @@
#include "src/tint/lang/wgsl/sem/materialize.h"
-#include "src/tint/lang/core/type/test_helper.h"
+#include "src/tint/lang/core/type/helper_test.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/utils/rtti/switch.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/override_test.cc b/src/tint/lang/wgsl/resolver/override_test.cc
index 875bd19..3748ce2 100644
--- a/src/tint/lang/wgsl/resolver/override_test.cc
+++ b/src/tint/lang/wgsl/resolver/override_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/resolver/ptr_ref_test.cc b/src/tint/lang/wgsl/resolver/ptr_ref_test.cc
index 729c25d..998f3a1 100644
--- a/src/tint/lang/wgsl/resolver/ptr_ref_test.cc
+++ b/src/tint/lang/wgsl/resolver/ptr_ref_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/type/reference.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/load.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/ptr_ref_validation_test.cc b/src/tint/lang/wgsl/resolver/ptr_ref_validation_test.cc
index 83d3cd8..91f5247 100644
--- a/src/tint/lang/wgsl/resolver/ptr_ref_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/ptr_ref_validation_test.cc
@@ -17,7 +17,7 @@
#include "src/tint/lang/core/type/texture_dimension.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/resolver/resolver_behavior_test.cc b/src/tint/lang/wgsl/resolver/resolver_behavior_test.cc
index 13e6fb7..62ee75d 100644
--- a/src/tint/lang/wgsl/resolver/resolver_behavior_test.cc
+++ b/src/tint/lang/wgsl/resolver/resolver_behavior_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "gtest/gtest.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/for_loop_statement.h"
#include "src/tint/lang/wgsl/sem/if_statement.h"
#include "src/tint/lang/wgsl/sem/switch_statement.h"
diff --git a/src/tint/lang/wgsl/resolver/resolver_test_helper.cc b/src/tint/lang/wgsl/resolver/resolver_helper_test.cc
similarity index 92%
rename from src/tint/lang/wgsl/resolver/resolver_test_helper.cc
rename to src/tint/lang/wgsl/resolver/resolver_helper_test.cc
index 90e50d0..bdcd259 100644
--- a/src/tint/lang/wgsl/resolver/resolver_test_helper.cc
+++ b/src/tint/lang/wgsl/resolver/resolver_helper_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include <memory>
diff --git a/src/tint/lang/wgsl/resolver/resolver_test_helper.h b/src/tint/lang/wgsl/resolver/resolver_helper_test.h
similarity index 98%
rename from src/tint/lang/wgsl/resolver/resolver_test_helper.h
rename to src/tint/lang/wgsl/resolver/resolver_helper_test.h
index c2f7d5b..bcf46a8 100644
--- a/src/tint/lang/wgsl/resolver/resolver_test_helper.h
+++ b/src/tint/lang/wgsl/resolver/resolver_helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_WGSL_RESOLVER_RESOLVER_TEST_HELPER_H_
-#define SRC_TINT_LANG_WGSL_RESOLVER_RESOLVER_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_WGSL_RESOLVER_RESOLVER_HELPER_TEST_H_
+#define SRC_TINT_LANG_WGSL_RESOLVER_RESOLVER_HELPER_TEST_H_
#include <functional>
#include <memory>
@@ -862,4 +862,4 @@
} // namespace builder
} // namespace tint::resolver
-#endif // SRC_TINT_LANG_WGSL_RESOLVER_RESOLVER_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_WGSL_RESOLVER_RESOLVER_HELPER_TEST_H_
diff --git a/src/tint/lang/wgsl/resolver/resolver_test.cc b/src/tint/lang/wgsl/resolver/resolver_test.cc
index 913175d..d9db2bf 100644
--- a/src/tint/lang/wgsl/resolver/resolver_test.cc
+++ b/src/tint/lang/wgsl/resolver/resolver_test.cc
@@ -38,7 +38,7 @@
#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/lang/wgsl/sem/function.h"
#include "src/tint/lang/wgsl/sem/member_accessor_expression.h"
diff --git a/src/tint/lang/wgsl/resolver/root_identifier_test.cc b/src/tint/lang/wgsl/resolver/root_identifier_test.cc
index 6f4386f..ecfe957 100644
--- a/src/tint/lang/wgsl/resolver/root_identifier_test.cc
+++ b/src/tint/lang/wgsl/resolver/root_identifier_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "src/tint/lang/core/type/texture_dimension.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/index_accessor_expression.h"
#include "src/tint/lang/wgsl/sem/member_accessor_expression.h"
diff --git a/src/tint/lang/wgsl/resolver/side_effects_test.cc b/src/tint/lang/wgsl/resolver/side_effects_test.cc
index 84a04d4..f21495a 100644
--- a/src/tint/lang/wgsl/resolver/side_effects_test.cc
+++ b/src/tint/lang/wgsl/resolver/side_effects_test.cc
@@ -19,7 +19,7 @@
#include "src/tint/lang/core/builtin/extension.h"
#include "src/tint/lang/core/builtin/texel_format.h"
#include "src/tint/lang/core/type/texture_dimension.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/index_accessor_expression.h"
#include "src/tint/lang/wgsl/sem/member_accessor_expression.h"
#include "src/tint/lang/wgsl/sem/value_expression.h"
diff --git a/src/tint/lang/wgsl/resolver/struct_address_space_use_test.cc b/src/tint/lang/wgsl/resolver/struct_address_space_use_test.cc
index e6395d8..46a7b2c 100644
--- a/src/tint/lang/wgsl/resolver/struct_address_space_use_test.cc
+++ b/src/tint/lang/wgsl/resolver/struct_address_space_use_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/struct.h"
using ::testing::UnorderedElementsAre;
diff --git a/src/tint/lang/wgsl/resolver/struct_layout_test.cc b/src/tint/lang/wgsl/resolver/struct_layout_test.cc
index 5ee9362..39c9ca4 100644
--- a/src/tint/lang/wgsl/resolver/struct_layout_test.cc
+++ b/src/tint/lang/wgsl/resolver/struct_layout_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/wgsl/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/struct.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/resolver/struct_pipeline_stage_use_test.cc b/src/tint/lang/wgsl/resolver/struct_pipeline_stage_use_test.cc
index bccdb9a..d0c8f07 100644
--- a/src/tint/lang/wgsl/resolver/struct_pipeline_stage_use_test.cc
+++ b/src/tint/lang/wgsl/resolver/struct_pipeline_stage_use_test.cc
@@ -17,7 +17,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/core/builtin/builtin_value.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/struct.h"
namespace tint::resolver {
diff --git a/src/tint/lang/wgsl/resolver/type_validation_test.cc b/src/tint/lang/wgsl/resolver/type_validation_test.cc
index 5b09dc2..32f6338 100644
--- a/src/tint/lang/wgsl/resolver/type_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/type_validation_test.cc
@@ -19,7 +19,7 @@
#include "src/tint/lang/wgsl/ast/return_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/resolver/unresolved_identifier_test.cc b/src/tint/lang/wgsl/resolver/unresolved_identifier_test.cc
index d107760..4564d4b 100644
--- a/src/tint/lang/wgsl/resolver/unresolved_identifier_test.cc
+++ b/src/tint/lang/wgsl/resolver/unresolved_identifier_test.cc
@@ -14,7 +14,7 @@
#include "gmock/gmock.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/resolver/validation_test.cc b/src/tint/lang/wgsl/resolver/validation_test.cc
index 4255005..81ec3d6 100644
--- a/src/tint/lang/wgsl/resolver/validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/validation_test.cc
@@ -34,7 +34,7 @@
#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/lang/wgsl/resolver/resolve.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/lang/wgsl/sem/function.h"
#include "src/tint/lang/wgsl/sem/member_accessor_expression.h"
diff --git a/src/tint/lang/wgsl/resolver/validator_is_storeable_test.cc b/src/tint/lang/wgsl/resolver/validator_is_storeable_test.cc
index 1024e74..e3f8b06 100644
--- a/src/tint/lang/wgsl/resolver/validator_is_storeable_test.cc
+++ b/src/tint/lang/wgsl/resolver/validator_is_storeable_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/core/type/atomic.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/resolver/value_constructor_validation_test.cc b/src/tint/lang/wgsl/resolver/value_constructor_validation_test.cc
index 3399e77..1220c83 100644
--- a/src/tint/lang/wgsl/resolver/value_constructor_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/value_constructor_validation_test.cc
@@ -14,7 +14,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/core/type/reference.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
#include "src/tint/lang/wgsl/sem/value_constructor.h"
#include "src/tint/lang/wgsl/sem/value_conversion.h"
#include "src/tint/utils/text/string_stream.h"
diff --git a/src/tint/lang/wgsl/resolver/variable_test.cc b/src/tint/lang/wgsl/resolver/variable_test.cc
index bfac51b..af7b0d1 100644
--- a/src/tint/lang/wgsl/resolver/variable_test.cc
+++ b/src/tint/lang/wgsl/resolver/variable_test.cc
@@ -16,7 +16,7 @@
#include "src/tint/lang/core/type/reference.h"
#include "src/tint/lang/core/type/texture_dimension.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/resolver/variable_validation_test.cc b/src/tint/lang/wgsl/resolver/variable_validation_test.cc
index 0d19278..6236fbc 100644
--- a/src/tint/lang/wgsl/resolver/variable_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/variable_validation_test.cc
@@ -15,7 +15,7 @@
#include "gmock/gmock.h"
#include "src/tint/lang/core/type/texture_dimension.h"
#include "src/tint/lang/wgsl/resolver/resolver.h"
-#include "src/tint/lang/wgsl/resolver/resolver_test_helper.h"
+#include "src/tint/lang/wgsl/resolver/resolver_helper_test.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/lang/wgsl/sem/diagnostic_severity_test.cc b/src/tint/lang/wgsl/sem/diagnostic_severity_test.cc
index 57c0bab..49477c0 100644
--- a/src/tint/lang/wgsl/sem/diagnostic_severity_test.cc
+++ b/src/tint/lang/wgsl/sem/diagnostic_severity_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/sem/test_helper.h"
+#include "src/tint/lang/wgsl/sem/helper_test.h"
#include "src/tint/lang/wgsl/sem/module.h"
diff --git a/src/tint/lang/wgsl/sem/test_helper.h b/src/tint/lang/wgsl/sem/helper_test.h
similarity index 90%
rename from src/tint/lang/wgsl/sem/test_helper.h
rename to src/tint/lang/wgsl/sem/helper_test.h
index 8006d17..583cbde 100644
--- a/src/tint/lang/wgsl/sem/test_helper.h
+++ b/src/tint/lang/wgsl/sem/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_WGSL_SEM_TEST_HELPER_H_
-#define SRC_TINT_LANG_WGSL_SEM_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_WGSL_SEM_HELPER_TEST_H_
+#define SRC_TINT_LANG_WGSL_SEM_HELPER_TEST_H_
#include <utility>
@@ -43,4 +43,4 @@
} // namespace tint::sem
-#endif // SRC_TINT_LANG_WGSL_SEM_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_WGSL_SEM_HELPER_TEST_H_
diff --git a/src/tint/lang/wgsl/sem/struct_test.cc b/src/tint/lang/wgsl/sem/struct_test.cc
index 0706b01..f6c3340 100644
--- a/src/tint/lang/wgsl/sem/struct_test.cc
+++ b/src/tint/lang/wgsl/sem/struct_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/sem/struct.h"
#include "src/tint/lang/core/type/texture.h"
-#include "src/tint/lang/wgsl/sem/test_helper.h"
+#include "src/tint/lang/wgsl/sem/helper_test.h"
namespace tint::sem {
namespace {
diff --git a/src/tint/lang/wgsl/sem/value_expression_test.cc b/src/tint/lang/wgsl/sem/value_expression_test.cc
index 541c8d3..36c7f17 100644
--- a/src/tint/lang/wgsl/sem/value_expression_test.cc
+++ b/src/tint/lang/wgsl/sem/value_expression_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/sem/value_expression.h"
-#include "src/tint/lang/wgsl/sem/test_helper.h"
+#include "src/tint/lang/wgsl/sem/helper_test.h"
#include "src/tint/lang/wgsl/sem/materialize.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/alias_type_test.cc b/src/tint/lang/wgsl/writer/ast_printer/alias_type_test.cc
index 79d202f..4b8a469 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/alias_type_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/alias_type_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/array_accessor_test.cc b/src/tint/lang/wgsl/writer/ast_printer/array_accessor_test.cc
index ff1dfb9..715ddd2 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/array_accessor_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/array_accessor_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/assign_test.cc b/src/tint/lang/wgsl/writer/ast_printer/assign_test.cc
index c5d4b02..fe99cc6 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/assign_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/assign_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/ast_printer_test.cc b/src/tint/lang/wgsl/writer/ast_printer/ast_printer_test.cc
index 7103c62..192b326 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/ast_printer_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/ast_printer_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/sem/variable.h"
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/binary_test.cc b/src/tint/lang/wgsl/writer/ast_printer/binary_test.cc
index 1d6595c..aa919a0 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/binary_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/binary_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/bitcast_test.cc b/src/tint/lang/wgsl/writer/ast_printer/bitcast_test.cc
index efc6962..1915238 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/bitcast_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/bitcast_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/block_test.cc b/src/tint/lang/wgsl/writer/ast_printer/block_test.cc
index bee22da..fb84b63 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/block_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/block_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/break_test.cc b/src/tint/lang/wgsl/writer/ast_printer/break_test.cc
index a6ac30c..ed479e6 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/break_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/break_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/call_test.cc b/src/tint/lang/wgsl/writer/ast_printer/call_test.cc
index 2b4df2e..0ebb30c 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/call_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/call_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/call_statement.h"
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/case_test.cc b/src/tint/lang/wgsl/writer/ast_printer/case_test.cc
index ba79b81..9dc5f5f 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/case_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/case_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/cast_test.cc b/src/tint/lang/wgsl/writer/ast_printer/cast_test.cc
index 0b0e8a6..a3d2976 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/cast_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/cast_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/const_assert_test.cc b/src/tint/lang/wgsl/writer/ast_printer/const_assert_test.cc
index f929348..9b3c9bf 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/const_assert_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/const_assert_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/constructor_test.cc b/src/tint/lang/wgsl/writer/ast_printer/constructor_test.cc
index df68309..6e06e199a 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/constructor_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/constructor_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/continue_test.cc b/src/tint/lang/wgsl/writer/ast_printer/continue_test.cc
index eb0ae84..3f38859 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/continue_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/continue_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/diagnostic_test.cc b/src/tint/lang/wgsl/writer/ast_printer/diagnostic_test.cc
index e76a90c..0654e13 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/diagnostic_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/diagnostic_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/discard_test.cc b/src/tint/lang/wgsl/writer/ast_printer/discard_test.cc
index a04e75a..23ebfce 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/discard_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/discard_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/enable_test.cc b/src/tint/lang/wgsl/writer/ast_printer/enable_test.cc
index ca7474e..f6d5ad9 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/enable_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/enable_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/function_test.cc b/src/tint/lang/wgsl/writer/ast_printer/function_test.cc
index 5ae3823..ea68d17 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/function_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/function_test.cc
@@ -16,7 +16,7 @@
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/global_decl_test.cc b/src/tint/lang/wgsl/writer/ast_printer/global_decl_test.cc
index c1d6fbf..b64db55 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/global_decl_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/global_decl_test.cc
@@ -16,7 +16,7 @@
#include "src/tint/lang/core/type/texture_dimension.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/test_helper.h b/src/tint/lang/wgsl/writer/ast_printer/helper_test.h
similarity index 91%
rename from src/tint/lang/wgsl/writer/ast_printer/test_helper.h
rename to src/tint/lang/wgsl/writer/ast_printer/helper_test.h
index 94b2401..861f42c 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/test_helper.h
+++ b/src/tint/lang/wgsl/writer/ast_printer/helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_WGSL_WRITER_AST_PRINTER_TEST_HELPER_H_
-#define SRC_TINT_LANG_WGSL_WRITER_AST_PRINTER_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_WGSL_WRITER_AST_PRINTER_HELPER_TEST_H_
+#define SRC_TINT_LANG_WGSL_WRITER_AST_PRINTER_HELPER_TEST_H_
#include <memory>
#include <utility>
@@ -65,4 +65,4 @@
} // namespace tint::wgsl::writer
-#endif // SRC_TINT_LANG_WGSL_WRITER_AST_PRINTER_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_WGSL_WRITER_AST_PRINTER_HELPER_TEST_H_
diff --git a/src/tint/lang/wgsl/writer/ast_printer/identifier_test.cc b/src/tint/lang/wgsl/writer/ast_printer/identifier_test.cc
index f9a5910..5124322 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/identifier_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/identifier_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/if_test.cc b/src/tint/lang/wgsl/writer/ast_printer/if_test.cc
index 174afa8..1560a8a 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/if_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/if_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/literal_test.cc b/src/tint/lang/wgsl/writer/ast_printer/literal_test.cc
index a7ed374..910ec70 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/literal_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/literal_test.cc
@@ -14,7 +14,7 @@
#include <cstring>
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/loop_test.cc b/src/tint/lang/wgsl/writer/ast_printer/loop_test.cc
index aafa543..6df3c1a 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/loop_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/loop_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/member_accessor_test.cc b/src/tint/lang/wgsl/writer/ast_printer/member_accessor_test.cc
index a65285e..8d56113 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/member_accessor_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/member_accessor_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/return_test.cc b/src/tint/lang/wgsl/writer/ast_printer/return_test.cc
index 936a614..f83890a 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/return_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/return_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/switch_test.cc b/src/tint/lang/wgsl/writer/ast_printer/switch_test.cc
index 9c03b21..0714b62 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/switch_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/switch_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/type_test.cc b/src/tint/lang/wgsl/writer/ast_printer/type_test.cc
index 38a4a30..63487f5 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/type_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/type_test.cc
@@ -17,7 +17,7 @@
#include "src/tint/lang/core/type/multisampled_texture.h"
#include "src/tint/lang/core/type/sampled_texture.h"
#include "src/tint/lang/core/type/texture_dimension.h"
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/unary_op_test.cc b/src/tint/lang/wgsl/writer/ast_printer/unary_op_test.cc
index bc5402f..fbf2c8a 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/unary_op_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/unary_op_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/variable_decl_statement_test.cc b/src/tint/lang/wgsl/writer/ast_printer/variable_decl_statement_test.cc
index 33d50c3..b7a544c 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/variable_decl_statement_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/variable_decl_statement_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ast_printer/variable_test.cc b/src/tint/lang/wgsl/writer/ast_printer/variable_test.cc
index d969942..c56619f1 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/variable_test.cc
+++ b/src/tint/lang/wgsl/writer/ast_printer/variable_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/wgsl/writer/ast_printer/test_helper.h"
+#include "src/tint/lang/wgsl/writer/ast_printer/helper_test.h"
#include "src/tint/utils/text/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/writer/ir_to_program/ir_to_program_test.h b/src/tint/lang/wgsl/writer/ir_to_program/ir_to_program_test.h
index 2abae48..1095d0f 100644
--- a/src/tint/lang/wgsl/writer/ir_to_program/ir_to_program_test.h
+++ b/src/tint/lang/wgsl/writer/ir_to_program/ir_to_program_test.h
@@ -17,7 +17,7 @@
#include <string>
-#include "src/tint/lang/core/ir/ir_test_helper.h"
+#include "src/tint/lang/core/ir/ir_helper_test.h"
namespace tint::wgsl::writer {
