Переглянути джерело

Put min_prelude in a testdata dir (#5635)

This makes the min_prelude files a little more consistent with how we
use testdata elsewhere, avoiding some special casing of them.
Jon Ross-Perkins 11 місяців тому
батько
коміт
78d4cce9f8
99 змінених файлів з 101 додано та 111 видалено
  1. 1 1
      toolchain/check/testdata/alias/local.carbon
  2. 1 1
      toolchain/check/testdata/as/basics.carbon
  3. 1 1
      toolchain/check/testdata/class/destroy_calls.carbon
  4. 1 1
      toolchain/check/testdata/class/destroy_decl.carbon
  5. 1 1
      toolchain/check/testdata/class/fail_abstract.carbon
  6. 1 1
      toolchain/check/testdata/class/fail_abstract_in_tuple.carbon
  7. 1 1
      toolchain/check/testdata/const/basics.carbon
  8. 1 1
      toolchain/check/testdata/deduce/binding_pattern.carbon
  9. 1 1
      toolchain/check/testdata/deduce/symbolic_facets.carbon
  10. 1 1
      toolchain/check/testdata/eval/aggregates.carbon
  11. 1 1
      toolchain/check/testdata/facet/access.carbon
  12. 1 1
      toolchain/check/testdata/facet/call_combined_impl_witness.carbon
  13. 1 1
      toolchain/check/testdata/facet/combine.carbon
  14. 1 1
      toolchain/check/testdata/facet/convert_class_type_to_facet_type.carbon
  15. 1 1
      toolchain/check/testdata/facet/convert_class_type_to_generic_facet_value.carbon
  16. 1 1
      toolchain/check/testdata/facet/convert_class_value_to_facet_value_value.carbon
  17. 1 1
      toolchain/check/testdata/facet/convert_class_value_to_generic_facet_value_value.carbon
  18. 1 1
      toolchain/check/testdata/facet/convert_facet_type_to_facet_value.carbon
  19. 1 1
      toolchain/check/testdata/facet/convert_facet_value_as_type_knows_original_type.carbon
  20. 1 1
      toolchain/check/testdata/facet/convert_facet_value_to_facet_value.carbon
  21. 1 1
      toolchain/check/testdata/facet/convert_facet_value_to_itself.carbon
  22. 1 1
      toolchain/check/testdata/facet/convert_facet_value_to_narrowed_facet_type.carbon
  23. 1 1
      toolchain/check/testdata/facet/convert_facet_value_value_to_blanket_impl.carbon
  24. 1 1
      toolchain/check/testdata/facet/convert_facet_value_value_to_generic_facet_value_value.carbon
  25. 1 1
      toolchain/check/testdata/facet/convert_facet_value_value_to_itself.carbon
  26. 1 1
      toolchain/check/testdata/facet/convert_interface.carbon
  27. 1 1
      toolchain/check/testdata/facet/facet_assoc_const.carbon
  28. 1 1
      toolchain/check/testdata/facet/fail_convert_class_type_to_generic_facet_value.carbon
  29. 1 1
      toolchain/check/testdata/facet/fail_convert_facet_value_to_missing_impl.carbon
  30. 1 1
      toolchain/check/testdata/facet/fail_convert_type_erased_type_to_facet.carbon
  31. 1 1
      toolchain/check/testdata/facet/fail_deduction_uses_runtime_type_conversion.carbon
  32. 1 1
      toolchain/check/testdata/facet/fail_incomplete.carbon
  33. 1 1
      toolchain/check/testdata/facet/fail_namespace_type.carbon
  34. 1 1
      toolchain/check/testdata/facet/runtime_value.carbon
  35. 1 1
      toolchain/check/testdata/facet/tuple_and_struct_type_literal.carbon
  36. 1 1
      toolchain/check/testdata/function/call/alias.carbon
  37. 1 1
      toolchain/check/testdata/function/call/return_implicit.carbon
  38. 1 1
      toolchain/check/testdata/function/declaration/fail_import_incomplete_return.carbon
  39. 1 1
      toolchain/check/testdata/function/definition/fail_local_decl.carbon
  40. 1 1
      toolchain/check/testdata/function/generic/call.carbon
  41. 1 1
      toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon
  42. 1 1
      toolchain/check/testdata/function/generic/type_param.carbon
  43. 1 1
      toolchain/check/testdata/if/basics.carbon
  44. 1 1
      toolchain/check/testdata/impl/extend_final.carbon
  45. 1 1
      toolchain/check/testdata/impl/fail_extend_impl_scope.carbon
  46. 1 1
      toolchain/check/testdata/impl/fail_impl_as_scope.carbon
  47. 1 1
      toolchain/check/testdata/impl/forward_decls.carbon
  48. 1 1
      toolchain/check/testdata/impl/generic_redeclaration.carbon
  49. 1 1
      toolchain/check/testdata/impl/impl_thunk_min_prelude.carbon
  50. 1 1
      toolchain/check/testdata/impl/import_self.carbon
  51. 1 1
      toolchain/check/testdata/impl/interface_args.carbon
  52. 1 1
      toolchain/check/testdata/impl/lookup/canonical_query_self.carbon
  53. 1 1
      toolchain/check/testdata/impl/lookup/fail_function_types.carbon
  54. 1 1
      toolchain/check/testdata/impl/lookup/find_in_final.carbon
  55. 1 1
      toolchain/check/testdata/impl/lookup/impl_cycle.carbon
  56. 1 1
      toolchain/check/testdata/impl/lookup/impl_forall.carbon
  57. 1 1
      toolchain/check/testdata/impl/lookup/impl_overlap.carbon
  58. 1 1
      toolchain/check/testdata/impl/lookup/import.carbon
  59. 1 1
      toolchain/check/testdata/impl/lookup/import_final.carbon
  60. 1 1
      toolchain/check/testdata/impl/lookup/lookup_interface_with_enclosing_generic_inside_rewrite_constraint.carbon
  61. 1 1
      toolchain/check/testdata/impl/lookup/specialization.carbon
  62. 1 1
      toolchain/check/testdata/impl/lookup/specialization_poison.carbon
  63. 1 1
      toolchain/check/testdata/impl/lookup/specialization_with_symbolic_rewrite.carbon
  64. 1 1
      toolchain/check/testdata/impl/lookup/struct.carbon
  65. 1 1
      toolchain/check/testdata/impl/lookup/symbolic_lookup.carbon
  66. 1 1
      toolchain/check/testdata/impl/lookup/unused_generic_binding.carbon
  67. 1 1
      toolchain/check/testdata/interface/as_type_of_type.carbon
  68. 1 1
      toolchain/check/testdata/interface/compound_member_access.carbon
  69. 1 1
      toolchain/check/testdata/interface/default_fn.carbon
  70. 1 1
      toolchain/check/testdata/interface/fail_member_lookup.carbon
  71. 1 1
      toolchain/check/testdata/interface/generic_method.carbon
  72. 1 1
      toolchain/check/testdata/namespace/name_poisoning.carbon
  73. 1 1
      toolchain/check/testdata/patterns/underscore.carbon
  74. 1 1
      toolchain/check/testdata/return/import_convert_function.carbon
  75. 1 1
      toolchain/check/testdata/tuple/class_tuples.carbon
  76. 1 1
      toolchain/check/testdata/tuple/element_access.carbon
  77. 1 1
      toolchain/check/testdata/tuple/import.carbon
  78. 1 1
      toolchain/check/testdata/tuple/in_place_tuple_init.carbon
  79. 1 1
      toolchain/check/testdata/tuple/tuple_pattern.carbon
  80. 1 1
      toolchain/check/testdata/var/decl.carbon
  81. 1 1
      toolchain/check/testdata/var/decl_with_init.carbon
  82. 1 1
      toolchain/check/testdata/var/fail_duplicate_decl.carbon
  83. 1 1
      toolchain/check/testdata/var/fail_init_with_self.carbon
  84. 1 1
      toolchain/check/testdata/var/fail_lookup_outside_scope.carbon
  85. 1 1
      toolchain/check/testdata/var/global_lookup_in_scope.carbon
  86. 1 1
      toolchain/check/testdata/var/lookup.carbon
  87. 1 1
      toolchain/check/testdata/var/shadowing.carbon
  88. 1 1
      toolchain/check/testdata/var/var_pattern.carbon
  89. 1 1
      toolchain/check/testdata/where_expr/dot_self_impls.carbon
  90. 1 1
      toolchain/check/testdata/while/while.carbon
  91. 3 3
      toolchain/docs/adding_features.md
  92. 4 5
      toolchain/testing/BUILD
  93. 0 9
      toolchain/testing/min_prelude/BUILD
  94. 1 1
      toolchain/testing/testdata/min_prelude/bool.carbon
  95. 1 1
      toolchain/testing/testdata/min_prelude/convert.carbon
  96. 0 0
      toolchain/testing/testdata/min_prelude/destroy.carbon
  97. 1 1
      toolchain/testing/testdata/min_prelude/facet_types.carbon
  98. 1 1
      toolchain/testing/testdata/min_prelude/int.carbon
  99. 0 0
      toolchain/testing/testdata/min_prelude/parts/as.carbon

+ 1 - 1
toolchain/check/testdata/alias/local.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/as/basics.carbon

@@ -1,7 +1,7 @@
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/class/destroy_calls.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/class/destroy_decl.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/class/fail_abstract.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/class/fail_abstract_in_tuple.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/const/basics.carbon

@@ -1,7 +1,7 @@
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/deduce/binding_pattern.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/deduce/symbolic_facets.carbon

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
 // EXTRA-ARGS: --dump-sem-ir-ranges=only
 // EXTRA-ARGS: --dump-sem-ir-ranges=only
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/eval/aggregates.carbon

@@ -1,7 +1,7 @@
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// INCLUDE-FILE: toolchain/testing/min_prelude/int.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/int.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/access.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/call_combined_impl_witness.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/combine.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_class_type_to_facet_type.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_class_type_to_generic_facet_value.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_class_value_to_facet_value_value.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_class_value_to_generic_facet_value_value.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_facet_type_to_facet_value.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_facet_value_as_type_knows_original_type.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_facet_value_to_facet_value.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_facet_value_to_itself.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_facet_value_to_narrowed_facet_type.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_facet_value_value_to_blanket_impl.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_facet_value_value_to_generic_facet_value_value.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_facet_value_value_to_itself.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/convert_interface.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/facet_assoc_const.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/fail_convert_class_type_to_generic_facet_value.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/fail_convert_facet_value_to_missing_impl.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/fail_convert_type_erased_type_to_facet.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/fail_deduction_uses_runtime_type_conversion.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/fail_incomplete.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/fail_namespace_type.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/runtime_value.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/facet/tuple_and_struct_type_literal.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/function/call/alias.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/function/call/return_implicit.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/function/declaration/fail_import_incomplete_return.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/function/definition/fail_local_decl.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/function/generic/call.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/function/generic/type_param.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/if/basics.carbon

@@ -1,7 +1,7 @@
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// INCLUDE-FILE: toolchain/testing/min_prelude/bool.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/bool.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/extend_final.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/fail_extend_impl_scope.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/fail_impl_as_scope.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/forward_decls.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/generic_redeclaration.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/impl_thunk_min_prelude.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/import_self.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/interface_args.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/canonical_query_self.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/fail_function_types.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/find_in_final.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/impl_cycle.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/impl_forall.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/impl_overlap.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/import.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/import_final.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/lookup_interface_with_enclosing_generic_inside_rewrite_constraint.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/specialization.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/specialization_poison.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/specialization_with_symbolic_rewrite.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/struct.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/symbolic_lookup.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/impl/lookup/unused_generic_binding.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/interface/as_type_of_type.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/interface/compound_member_access.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/interface/default_fn.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/interface/fail_member_lookup.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/interface/generic_method.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/namespace/name_poisoning.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/patterns/underscore.carbon

@@ -7,7 +7,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/return/import_convert_function.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/tuple/class_tuples.carbon

@@ -1,7 +1,7 @@
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// INCLUDE-FILE: toolchain/testing/min_prelude/convert.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/convert.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/tuple/element_access.carbon

@@ -1,7 +1,7 @@
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// INCLUDE-FILE: toolchain/testing/min_prelude/int.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/int.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/tuple/import.carbon

@@ -1,7 +1,7 @@
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// INCLUDE-FILE: toolchain/testing/min_prelude/int.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/int.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/tuple/in_place_tuple_init.carbon

@@ -1,7 +1,7 @@
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// INCLUDE-FILE: toolchain/testing/min_prelude/int.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/int.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/tuple/tuple_pattern.carbon

@@ -1,7 +1,7 @@
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/var/decl.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/var/decl_with_init.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/var/fail_duplicate_decl.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/var/fail_init_with_self.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/var/fail_lookup_outside_scope.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/var/global_lookup_in_scope.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/var/lookup.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/var/shadowing.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/var/var_pattern.carbon

@@ -4,7 +4,7 @@
 //
 //
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
 // EXTRA-ARGS: --dump-sem-ir-ranges=if-present
-// INCLUDE-FILE: toolchain/testing/min_prelude/destroy.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/where_expr/dot_self_impls.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 1 - 1
toolchain/check/testdata/while/while.carbon

@@ -1,7 +1,7 @@
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Part of the Carbon Language project, under the Apache License v2.0 with LLVM
 // Exceptions. See /LICENSE for license information.
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// INCLUDE-FILE: toolchain/testing/min_prelude/bool.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/bool.carbon
 //
 //
 // AUTOUPDATE
 // AUTOUPDATE
 // TIP: To test this file alone, run:
 // TIP: To test this file alone, run:

+ 3 - 3
toolchain/docs/adding_features.md

@@ -507,12 +507,12 @@ minimal `Core` package and `prelude` library to the file test with the
 `check/testdata/facet_types/min_prelude/my_test.carbon` might contain:
 `check/testdata/facet_types/min_prelude/my_test.carbon` might contain:
 
 
 ```
 ```
-// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
 ```
 ```
 
 
 We have a set of minimal `Core` preludes for testing different compiler feature
 We have a set of minimal `Core` preludes for testing different compiler feature
-areas in `//toolchain/testing/min_prelude/`. Each file begins with the line
-`package Core library "prelude";` to make it provide a prelude.
+areas in `//toolchain/testing/testdata/min_prelude/`. Each file begins with the
+line `package Core library "prelude";` to make it provide a prelude.
 
 
 #### SemIR dumps and ranges
 #### SemIR dumps and ranges
 
 

+ 4 - 5
toolchain/testing/BUILD

@@ -22,10 +22,9 @@ filegroup(
 )
 )
 
 
 filegroup(
 filegroup(
-    name = "minimal_preludes",
-    data = [
-        "//toolchain/testing/min_prelude",
-    ],
+    name = "min_prelude",
+    srcs = glob(["testdata/min_prelude/**/*.carbon"]),
+    visibility = ["//visibility:public"],
 )
 )
 
 
 cc_library(
 cc_library(
@@ -61,7 +60,7 @@ file_test(
     size = "small",
     size = "small",
     timeout = "moderate",  # Taking >60 seconds in GitHub actions
     timeout = "moderate",  # Taking >60 seconds in GitHub actions
     srcs = ["file_test.cpp"],
     srcs = ["file_test.cpp"],
-    data = [":minimal_preludes"],
+    data = [":min_prelude"],
     tests = [":all_testdata"],
     tests = [":all_testdata"],
     deps = [
     deps = [
         "//common:all_llvm_targets",
         "//common:all_llvm_targets",

+ 0 - 9
toolchain/testing/min_prelude/BUILD

@@ -1,9 +0,0 @@
-# Part of the Carbon Language project, under the Apache License v2.0 with LLVM
-# Exceptions. See /LICENSE for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-filegroup(
-    name = "min_prelude",
-    srcs = glob(["**/*.carbon"]),
-    visibility = ["//visibility:public"],
-)

+ 1 - 1
toolchain/testing/min_prelude/bool.carbon → toolchain/testing/testdata/min_prelude/bool.carbon

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
 // EXTRA-ARGS: --custom-core --exclude-dump-file-prefix=min_prelude/
 // EXTRA-ARGS: --custom-core --exclude-dump-file-prefix=min_prelude/
-// INCLUDE-FILE: toolchain/testing/min_prelude/parts/as.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/parts/as.carbon
 
 
 // --- min_prelude/bool.carbon
 // --- min_prelude/bool.carbon
 
 

+ 1 - 1
toolchain/testing/min_prelude/convert.carbon → toolchain/testing/testdata/min_prelude/convert.carbon

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
 // EXTRA-ARGS: --custom-core --exclude-dump-file-prefix=min_prelude/
 // EXTRA-ARGS: --custom-core --exclude-dump-file-prefix=min_prelude/
-// INCLUDE-FILE: toolchain/testing/min_prelude/parts/as.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/parts/as.carbon
 
 
 // --- min_prelude/convert.carbon
 // --- min_prelude/convert.carbon
 
 

+ 0 - 0
toolchain/testing/min_prelude/destroy.carbon → toolchain/testing/testdata/min_prelude/destroy.carbon


+ 1 - 1
toolchain/testing/min_prelude/facet_types.carbon → toolchain/testing/testdata/min_prelude/facet_types.carbon

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
 // EXTRA-ARGS: --custom-core --exclude-dump-file-prefix=min_prelude/
 // EXTRA-ARGS: --custom-core --exclude-dump-file-prefix=min_prelude/
-// INCLUDE-FILE: toolchain/testing/min_prelude/parts/as.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/parts/as.carbon
 
 
 // --- min_prelude/facet_types.carbon
 // --- min_prelude/facet_types.carbon
 
 

+ 1 - 1
toolchain/testing/min_prelude/int.carbon → toolchain/testing/testdata/min_prelude/int.carbon

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //
 // EXTRA-ARGS: --custom-core --exclude-dump-file-prefix=min_prelude/
 // EXTRA-ARGS: --custom-core --exclude-dump-file-prefix=min_prelude/
-// INCLUDE-FILE: toolchain/testing/min_prelude/parts/as.carbon
+// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/parts/as.carbon
 
 
 // --- min_prelude/int.carbon
 // --- min_prelude/int.carbon
 
 

+ 0 - 0
toolchain/testing/min_prelude/parts/as.carbon → toolchain/testing/testdata/min_prelude/parts/as.carbon