From 82f33ff384de9daa1957342f43d9c7f66983fb1b Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Mon, 15 May 2023 16:23:59 -0700 Subject: [PATCH] Use new test framework in explorer to reduce per-test overhead (#2811) Isolating test execution time (no build time included): - Linux, `lit` test-per-file: Elapsed time: 28.214s, Critical Path: 13.97s - Linux, `cc_test`-per-file: Elapsed time: 11.534s, Critical Path: 6.05s - Linux, merged `cc_test` with 50 shards: Elapsed time: 11.677s, Critical Path: 11.17s - Mac, `lit` test-per-file: Elapsed time: 295.686s, Critical Path: 20.00s - Mac, `cc_test`-per-file: Elapsed time: 55.788s, Critical Path: 3.81s - Mac, merged `cc_test` with 50 shards: Elapsed time: 16.269s, Critical Path: 7.54s In GH actions: - [Before](https://github.com/carbon-language/carbon-lang/actions/runs/4866602695/jobs/8678306144?pr=2799): - test / test (ubuntu-22.04, fastbuild) (pull_request_target) Successful in 20m - test / test (ubuntu-22.04, opt) (pull_request_target) Successful in 15m - test / test (macos-12, fastbuild) (pull_request_target) Successful in 36m - test / test (macos-12, opt) (pull_request_target) Successful in 21m - [After](https://github.com/carbon-language/carbon-lang/actions/runs/4875154751/jobs/8697004066?pr=2811): - test / test (ubuntu-22.04, fastbuild) (pull_request_target) Successful in 10m - test / test (ubuntu-22.04, opt) (pull_request_target) Successful in 9m - test / test (macos-12, fastbuild) (pull_request_target) Successful in 12m - test / test (macos-12, opt) (pull_request_target) Successful in 9m I'm still leaving a handful of `lit` tests to test end-to-end binary execution. This is why testdata directories are split (`lit` tests next to the `explorer` binary, the `cc_test`s next to `ParseAndExecute`). --- explorer/BUILD | 39 +++++++++ explorer/file_test.cpp | 82 +++++++++++++++++++ explorer/fuzzing/BUILD | 4 +- explorer/interpreter/interpreter.cpp | 6 +- explorer/lit_autoupdate.py | 2 - explorer/lit_autoupdate_lit.py | 35 ++++++++ explorer/{testdata => lit_testdata}/BUILD | 6 -- explorer/lit_testdata/hello.carbon | 16 ++++ .../{testdata => lit_testdata}/lit.cfg.py | 0 .../trace.carbon | 0 .../basic_syntax => lit_testdata}/zero.carbon | 0 explorer/parse_and_execute/BUILD | 2 - explorer/testdata/addr/fail_method_let.carbon | 4 +- .../addr/fail_method_self_misspelled.carbon | 4 +- .../addr/fail_method_self_type.carbon | 4 +- explorer/testdata/addr/method.carbon | 2 - explorer/testdata/addr/nested_method.carbon | 2 - explorer/testdata/alias/alias_in_class.carbon | 2 - explorer/testdata/alias/class_alias.carbon | 2 - .../alias/fail_alias_expression.carbon | 4 +- explorer/testdata/alias/fail_alias_var.carbon | 4 +- ...il_interface_method_as_class_member.carbon | 4 +- .../alias/fail_namespace_alias_member.carbon | 4 +- .../testdata/alias/fail_self_alias.carbon | 4 +- .../alias/fail_wrong_fn_alias_use.carbon | 4 +- .../alias/fail_wrong_fn_alias_use_expr.carbon | 4 +- .../fail_wrong_interface_alias_use.carbon | 4 +- .../fail_wrong_namepsace_alias_use.carbon | 4 +- explorer/testdata/alias/function_alias.carbon | 2 - .../testdata/alias/interface_alias.carbon | 2 - .../testdata/alias/member_name_alias.carbon | 2 - .../testdata/alias/namespace_alias.carbon | 2 - .../alias/namespace_alias_recursive.carbon | 2 - explorer/testdata/alias/struct_alias.carbon | 2 - explorer/testdata/alias/type_alias.carbon | 2 - .../array/element_convertible_to_type.carbon | 2 - explorer/testdata/array/fail_index.carbon | 4 +- .../testdata/array/fail_negative_size.carbon | 4 +- ...il_print_uninitalized_array_element.carbon | 4 +- .../testdata/array/fail_size_mismatch.carbon | 4 +- explorer/testdata/array/index.carbon | 2 - explorer/testdata/array/nested.carbon | 2 - .../uninitialized_global_array_access.carbon | 2 - .../uninitialized_local_array_access.carbon | 2 - explorer/testdata/as/as_same_type.carbon | 2 - explorer/testdata/as/convert.carbon | 2 - .../as/fail_destination_not_type.carbon | 4 +- .../as/fail_intrinsic_convert_no_args.carbon | 4 +- .../as/fail_intrinsic_convert_non_type.carbon | 4 +- .../testdata/as/fail_intrinsic_no_args.carbon | 4 +- .../as/fail_intrinsic_non_type.carbon | 4 +- .../testdata/as/fail_no_conversion.carbon | 4 +- explorer/testdata/as/implicit_as.carbon | 2 - .../as/intrinsic_convert_non_value.carbon | 2 - explorer/testdata/as/struct_as_class.carbon | 2 - explorer/testdata/assert/assert.carbon | 2 - explorer/testdata/assert/convert.carbon | 2 - explorer/testdata/assert/fail_assert.carbon | 4 +- explorer/testdata/assert/fail_convert.carbon | 4 +- .../assert/fail_intrinsic_bool_type.carbon | 4 +- .../assert/fail_intrinsic_no_args.carbon | 4 +- .../assert/fail_intrinsic_no_convert.carbon | 4 +- .../assert/fail_intrinsic_str_type.carbon | 4 +- explorer/testdata/assign/convert_rhs.carbon | 2 - .../testdata/assign/destruct_original.carbon | 2 - .../testdata/assign/reassign_original.carbon | 2 - .../assoc_const/bug_multi_impl_scoping.carbon | 2 - .../assoc_const/fail_anonymous.carbon | 4 +- .../assoc_const/fail_different_type.carbon | 4 +- .../assoc_const/fail_different_value.carbon | 4 +- .../assoc_const/fail_equal_indirectly.carbon | 4 +- .../fail_equal_to_dependent_type.carbon | 4 +- .../fail_implied_constraints.carbon | 4 +- .../assoc_const/fail_incomplete_impl_1.carbon | 4 +- .../assoc_const/fail_incomplete_impl_2.carbon | 4 +- .../assoc_const/fail_indirectly_equal.carbon | 4 +- .../fail_match_in_deduction.carbon | 4 +- .../assoc_const/fail_missing_equal.carbon | 4 +- .../assoc_const/fail_missing_rewrite.carbon | 4 +- .../fail_multiple_deduction.carbon | 4 +- .../fail_overspecified_impl.carbon | 4 +- .../assoc_const/fail_redefined.carbon | 4 +- .../fail_rewrite_creates_infinite_type.carbon | 4 +- .../assoc_const/fail_rewrite_cycle.carbon | 4 +- ...il_rewrite_depends_on_later_rewrite.carbon | 4 +- .../fail_simple_rewrite_cycle_1.carbon | 4 +- .../fail_simple_rewrite_cycle_2.carbon | 4 +- .../assoc_const/fail_unknown_value.carbon | 4 +- ...known_value_specified_in_constraint.carbon | 4 +- .../testdata/assoc_const/impl_lookup.carbon | 2 - .../impl_used_by_later_rewrite.carbon | 2 - .../testdata/assoc_const/implement.carbon | 2 - .../assoc_const/lookup_in_rewrite.carbon | 2 - .../assoc_const/member_of_value.carbon | 2 - .../assoc_const/pass_equal_to_rewrite.carbon | 2 - .../assoc_const/pass_rewrite_to_equal.carbon | 2 - .../assoc_const/resolve_rewrites.carbon | 2 - .../rewrite_depends_on_prior_rewrite.carbon | 2 - .../rewrite_interface_params.carbon | 2 - .../assoc_const/rewrite_large_type.carbon | 3 +- .../assoc_const/simple_constraint.carbon | 2 - .../assoc_const/simple_equality.carbon | 2 - .../testdata/auto/fail_use_in_init.carbon | 4 +- .../testdata/basic_syntax/addition.carbon | 2 - explorer/testdata/basic_syntax/choice.carbon | 2 - .../fail_alternative_not_type.carbon | 4 +- .../fail_alternative_uses_choice.carbon | 4 +- .../fail_assign_to_function.carbon | 4 +- .../basic_syntax/fail_assign_to_rval.carbon | 4 +- .../testdata/basic_syntax/fail_block.carbon | 4 +- .../fail_choice_extra_parens.carbon | 4 +- .../basic_syntax/fail_choice_no_parens.carbon | 4 +- .../fail_choice_pattern_extra_parens.carbon | 4 +- .../fail_choice_pattern_no_parens.carbon | 4 +- .../fail_compare_precedence.carbon | 4 +- .../basic_syntax/fail_invalid_char.carbon | 4 +- .../basic_syntax/fail_invalid_integer.carbon | 4 +- .../fail_invalid_integer_type.carbon | 4 +- .../fail_unimplemented_example.carbon | 4 +- .../fail_unknown_intrinsic.carbon | 4 +- .../fail_unsupported_integer_type.carbon | 4 +- explorer/testdata/basic_syntax/record.carbon | 2 - explorer/testdata/basic_syntax/star.carbon | 2 - explorer/testdata/block/empty.carbon | 2 - explorer/testdata/block/shadowing.carbon | 2 - .../testdata/choice/fail_recursive_use.carbon | 4 +- ..._choice_multiple_template_arguments.carbon | 2 - ...ric_choice_nested_in_template_class.carbon | 2 - .../generic_choice_simple_assignment.carbon | 2 - explorer/testdata/choice/mixed_arity.carbon | 2 - explorer/testdata/choice/type_of_type.carbon | 2 - explorer/testdata/class/abstract_class.carbon | 2 - explorer/testdata/class/assign.carbon | 2 - explorer/testdata/class/assign_member.carbon | 2 - .../testdata/class/base_constructor.carbon | 2 - explorer/testdata/class/bound_method.carbon | 2 - explorer/testdata/class/class_function.carbon | 2 - .../class/class_function_from_instance.carbon | 2 - .../testdata/class/class_function_self.carbon | 2 - .../class/class_function_value.carbon | 2 - .../class_inheritance_function_call.carbon | 2 - .../class/class_inheritance_methods.carbon | 2 - .../class/class_inheritance_multiple.carbon | 2 - .../class/class_inheritance_shadow.carbon | 2 - .../class/class_inheritance_variables.carbon | 2 - .../class/class_subtyping_argument.carbon | 2 - .../class/class_subtyping_basic.carbon | 2 - .../class/class_subtyping_multiple.carbon | 2 - explorer/testdata/class/empty_class.carbon | 2 - .../fail_abstract_method_not_supported.carbon | 4 +- .../fail_call_method_before_typecheck.carbon | 4 +- .../class/fail_call_undefined_method.carbon | 4 +- .../class/fail_class_named_self.carbon | 4 +- .../class/fail_direct_base_class_init.carbon | 4 +- .../class/fail_extends_final_class.carbon | 4 +- .../class/fail_extends_non_class.carbon | 4 +- .../class/fail_field_access_mismatch.carbon | 4 +- .../fail_field_access_mismatch_base.carbon | 4 +- .../fail_field_assign_mismatch_base.carbon | 4 +- .../testdata/class/fail_field_mismatch.carbon | 4 +- .../testdata/class/fail_field_missing.carbon | 4 +- .../fail_impl_method_not_existing.carbon | 4 +- .../class/fail_impl_method_not_virtual.carbon | 4 +- ...tantiate_abstract_class_constructor.carbon | 4 +- ...il_instantiate_abstract_class_empty.carbon | 4 +- ...l_instantiate_abstract_class_struct.carbon | 4 +- .../class/fail_invalid_subtyping.carbon | 4 +- .../fail_member_call_before_typecheck.carbon | 4 +- .../testdata/class/fail_member_of_self.carbon | 4 +- .../testdata/class/fail_method_deduced.carbon | 4 +- .../class/fail_method_from_class.carbon | 4 +- .../testdata/class/fail_method_in_var.carbon | 4 +- ...l_override_virtual_with_non_virtual.carbon | 4 +- .../class/fail_qualified_method.carbon | 4 +- .../fail_redeclare_virtual_method.carbon | 4 +- .../testdata/class/fail_return_method.carbon | 4 +- .../class/fail_use_before_typecheck.carbon | 4 +- .../class/fail_virtual_class_function.carbon | 4 +- .../class/fail_virtual_method_absent.carbon | 4 +- explorer/testdata/class/function_param.carbon | 2 - explorer/testdata/class/global_var.carbon | 2 - explorer/testdata/class/method.carbon | 2 - .../testdata/class/method_call_method.carbon | 2 - explorer/testdata/class/method_self.carbon | 2 - explorer/testdata/class/new_and_delete.carbon | 2 - .../class/new_and_delete_hierarchy.carbon | 2 - .../class/non_virtual_dispatch.carbon | 2 - .../non_virtual_dispatch_abstract.carbon | 2 - .../class/parametrized_base_class.carbon | 2 - .../testdata/class/pointer_conversion.carbon | 2 - explorer/testdata/class/temp.carbon | 2 - explorer/testdata/class/type_of_type.carbon | 2 - explorer/testdata/class/var.carbon | 2 - explorer/testdata/class/virtual_method.carbon | 2 - .../testdata/class/virtual_method_self.carbon | 2 - .../class/virtual_method_shadowed_attr.carbon | 2 - .../comparison/builtin_comparsion.carbon | 2 - .../comparison/builtin_equality.carbon | 2 - .../comparison/custom_equality.carbon | 2 - .../testdata/comparison/empty_struct.carbon | 2 - .../testdata/comparison/fail_no_impl.carbon | 4 +- .../binding_dot_self_in_constraint.carbon | 2 - .../testdata/constraint/binding_self.carbon | 2 - .../constraint/combined_interfaces.carbon | 2 - .../constraint/dot_self_is_other.carbon | 2 - .../constraint/fail_ambiguous_member.carbon | 4 +- .../constraint/fail_combine_equality.carbon | 4 +- .../fail_dot_self_after_scope.carbon | 4 +- .../fail_dot_self_after_scope_2.carbon | 4 +- .../fail_dot_self_not_in_scope.carbon | 4 +- .../constraint/fail_infinite_self.carbon | 4 +- .../constraint/fail_infinite_self_ptr.carbon | 4 +- .../constraint/fail_missing_member.carbon | 4 +- .../constraint/fail_non_type_self.carbon | 4 +- .../fail_where_equals_different_types.carbon | 4 +- .../fail_where_impls_non_constraint.carbon | 4 +- .../fail_where_impls_non_type.carbon | 4 +- .../fail_where_non_type_impls.carbon | 4 +- .../constraint/nondependent_where.carbon | 2 - .../qualified_lookup_in_where.carbon | 2 - explorer/testdata/constraint/rewrite.carbon | 2 - .../constraint/rewrite_compound.carbon | 2 - .../constraint/rewrite_compound_2.carbon | 2 - .../constraint/rewrite_in_qualifier.carbon | 2 - .../rewrite_in_qualifier_and_type.carbon | 2 - .../testdata/constraint/type_of_type.carbon | 2 - .../testdata/constraint/where_impls.carbon | 2 - .../constraint/where_multiple_equality.carbon | 2 - .../testdata/constraint/where_self.carbon | 2 - .../call_destructor_from_destructor.carbon | 2 - .../testdata/destructor/destroy_array.carbon | 2 - .../destructor/destroy_base_class.carbon | 2 - .../destroy_base_class_and_members.carbon | 2 - .../destructor/destroy_different_types.carbon | 2 - .../destroy_inner_destructor.carbon | 2 - .../destructor/destructor_with_return.carbon | 2 - .../destructor/dont_call_in_method.carbon | 2 - explorer/testdata/destructor/fail_addr.carbon | 4 +- ...ete_base_without_virtual_destructor.carbon | 4 +- ...ail_multiple_destructor_declaration.carbon | 4 +- .../destructor/fail_override_abstract.carbon | 4 +- .../destructor/fail_override_impl_none.carbon | 4 +- .../fail_override_virtual_virtual.carbon | 4 +- .../destructor/function_with_return.carbon | 2 - .../testdata/destructor/loop_block.carbon | 2 - .../destructor/loop_break_continue.carbon | 2 - .../nested_block_with_return.carbon | 2 - .../destructor/virtual_destructor.carbon | 2 - .../virtual_destructor_nested.carbon | 2 - explorer/testdata/for/fail_convert.carbon | 4 +- explorer/testdata/for/for_loop.carbon | 2 - explorer/testdata/for/for_loop_auto.carbon | 2 - explorer/testdata/for/for_loop_break.carbon | 2 - .../testdata/for/for_loop_continue.carbon | 2 - explorer/testdata/for/for_loop_empty.carbon | 2 - explorer/testdata/for/for_loop_nested.carbon | 2 - .../testdata/function/auto_return/add.carbon | 2 - .../auto_return/fail_direct_recurse.carbon | 4 +- .../auto_return/fail_multiple_returns.carbon | 4 +- .../auto_return/fail_no_return.carbon | 4 +- .../auto_return/fail_separate_decl.carbon | 4 +- .../auto_return/modify_arg_type.carbon | 2 - .../auto_return/modify_return_type.carbon | 2 - .../testdata/function/auto_return/type.carbon | 2 - .../testdata/function/convert_args.carbon | 2 - .../testdata/function/empty_params.carbon | 2 - .../function/fail_call_undefined.carbon | 4 +- .../function/fail_call_undefined_main.carbon | 2 - .../function/fail_call_with_tuple.carbon | 4 +- .../function/fail_invalid_fnty.carbon | 4 +- .../function/fail_main_with_parameters.carbon | 4 +- .../function/fail_match_no_return.carbon | 4 +- .../function/fail_match_partial_return.carbon | 4 +- .../function/fail_non_exhaustive_match.carbon | 4 +- .../function/fail_parameter_type.carbon | 4 +- .../function/fail_parameter_type_only.carbon | 4 +- .../fail_recurse_before_typecheck.carbon | 4 +- .../fail_recurse_in_return_type.carbon | 4 +- .../fail_return_call_has_invalid_body.carbon | 4 +- .../function/fail_var_type_is_call.carbon | 4 +- explorer/testdata/function/fnty.carbon | 2 - .../function/ignored_parameter.carbon | 2 - .../testdata/function/multiple_args.carbon | 2 - ...non_exhaustive_match_no_return_type.carbon | 2 - .../non_exhaustive_match_return.carbon | 2 - .../testdata/function/param_lifetime.carbon | 2 - explorer/testdata/function/recursive.carbon | 2 - explorer/testdata/function/return.carbon | 2 - .../return_convertible_to_type.carbon | 2 - .../function/return_exhaustive_match.carbon | 2 - explorer/testdata/function/type_match.carbon | 2 - .../generic_class/class_function.carbon | 2 - .../generic_class/convert_from_struct.carbon | 2 - .../generic_class/fail_args_mismatch.carbon | 4 +- .../fail_argument_deduction.carbon | 4 +- .../fail_bad_parameter_type.carbon | 4 +- .../fail_field_access_on_generic.carbon | 4 +- .../fail_generic_class_arg.carbon | 4 +- .../fail_generic_in_pattern.carbon | 4 +- .../fail_instantiate_non_generic.carbon | 4 +- .../generic_class/fail_no_args.carbon | 4 +- .../generic_class/fail_point_equal.carbon | 4 +- .../fail_return_type_is_type.carbon | 4 +- .../generic_class/fail_self_with_arg.carbon | 4 +- .../generic_class/fail_two_arg_lists.carbon | 4 +- .../fail_value_param_mismatch.carbon | 4 +- .../generic_class_substitution.carbon | 2 - .../generic_fun_and_class.carbon | 2 - .../generic_class/generic_point.carbon | 2 - .../generic_class/impl_with_argument.carbon | 2 - .../generic_class/impl_with_self.carbon | 2 - .../instantiation_at_compile_time.carbon | 2 - .../param_with_dependent_type.carbon | 2 - .../parameter_type_conversion.carbon | 2 - .../generic_class/point_with_interface.carbon | 2 - .../generic_class/use_at_compile_time.carbon | 2 - .../testdata/generic_class/use_self.carbon | 2 - .../testdata/generic_function/apply.carbon | 2 - .../call_at_compile_time.carbon | 2 - ...ail_implicit_conversion_extra_field.carbon | 4 +- ...l_implicit_conversion_missing_field.carbon | 4 +- .../fail_missing_exclam.carbon | 4 +- .../generic_function/fail_not_addable.carbon | 4 +- .../generic_function/fail_not_type.carbon | 4 +- .../fail_type_deduction_mismatch.carbon | 4 +- .../fail_type_deduction_unused.carbon | 4 +- .../generic_function/fail_type_only.carbon | 4 +- .../fail_wrong_variable_substituation.carbon | 4 +- .../generic_function/generic_method.carbon | 2 - .../implicit_conversion.carbon | 2 - .../instantiate_deduced.carbon | 2 - .../generic_function/non_generic_param.carbon | 2 - .../nondeduced_generic_param.carbon | 2 - .../generic_function/return_val.carbon | 2 - .../testdata/generic_function/swap.carbon | 2 - .../generic_function/tuple_map.carbon | 2 - .../generic_function/type_matching.carbon | 2 - .../testdata/if_else/convert_condition.carbon | 2 - explorer/testdata/if_else/if_else.carbon | 2 - explorer/testdata/if_else/if_else_if.carbon | 2 - .../testdata/if_else/if_else_if_else.carbon | 2 - explorer/testdata/if_else/if_false.carbon | 2 - explorer/testdata/if_else/if_nesting.carbon | 2 - explorer/testdata/if_else/if_true.carbon | 2 - .../if_expression/convert_condition.carbon | 2 - .../if_expression/if_then_else.carbon | 2 - .../testdata/impl/deducible_parameter.carbon | 2 - .../testdata/impl/fail_bad_member_kind.carbon | 4 +- explorer/testdata/impl/fail_impl_as.carbon | 4 +- .../impl/fail_impl_as_non_interface.carbon | 4 +- .../impl/fail_impl_as_not_constraint.carbon | 4 +- .../impl/fail_impl_as_parameterized.carbon | 4 +- .../impl/fail_impl_redefinition.carbon | 4 +- .../impl/fail_nondeducible_parameter.carbon | 4 +- .../impl/fail_param_interface_in_impl.carbon | 4 +- .../impl/fail_unmet_impls_constraint.carbon | 4 +- .../testdata/impl/generic_method_impl.carbon | 2 - .../impl/impl_in_generic_class.carbon | 2 - .../testdata/impl/impls_constraint.carbon | 2 - explorer/testdata/impl/param_impl.carbon | 2 - explorer/testdata/impl/param_impl2.carbon | 2 - .../testdata/impl/param_impl_with_self.carbon | 2 - .../impl/param_interface_in_impl.carbon | 2 - explorer/testdata/impl/struct.carbon | 2 - .../testdata/impl_match/build_tree.carbon | 2 - .../impl_match/fail_self_recurse.carbon | 4 +- ...il_self_recurse_without_match_first.carbon | 4 +- .../fail_simple_self_recurse.carbon | 4 +- .../impl_match/fail_struct_recurse.carbon | 4 +- .../impl_match/fail_three_step_recurse.carbon | 4 +- .../impl_match/fail_tuple_recurse.carbon | 4 +- .../testdata/impl_match/match_first.carbon | 2 - .../impl_match/self_recurse_with_match.carbon | 2 - .../self_recurse_with_match_first.carbon | 2 - .../testdata/impl_match/specialization.carbon | 2 - .../impl_match/type_structure_bindings.carbon | 2 - .../impl_match/type_structure_order.carbon | 2 - .../type_structure_vs_match_first.carbon | 2 - explorer/testdata/import/fail_order.carbon | 4 +- .../import/nonexistent_library.carbon | 2 - .../import/nonexistent_package.carbon | 2 - explorer/testdata/interface/addr_self.carbon | 2 - ...assoc_constant_constraints_in_scope.carbon | 2 - .../testdata/interface/class_function.carbon | 2 - .../interface/constrained_parameter.carbon | 2 - explorer/testdata/interface/extends.carbon | 2 - .../external_impl_point_vector.carbon | 2 - .../interface/external_impl_use_self.carbon | 2 - .../interface/fail_bad_member_kind.carbon | 4 +- .../fail_extends_not_constraint.carbon | 4 +- .../fail_external_impl_omit_self.carbon | 4 +- .../interface/fail_external_impl_self.carbon | 4 +- .../fail_impl_as_not_constraint.carbon | 4 +- .../interface/fail_impl_as_not_type.carbon | 4 +- .../interface/fail_impl_bad_member.carbon | 4 +- .../interface/fail_impl_missing_member.carbon | 4 +- .../interface/fail_impl_not_type.carbon | 4 +- .../fail_interface_missing_member.carbon | 4 +- .../fail_member_lookup_in_definition.carbon | 4 +- .../testdata/interface/fail_no_impl.carbon | 4 +- .../interface/fail_qualified_method.carbon | 4 +- .../fail_self_lookup_in_definition.carbon | 4 +- .../fail_use_assoc_const_before_decl.carbon | 4 +- .../fail_use_assoc_const_in_defn.carbon | 4 +- .../interface/fail_use_symbolic_member.carbon | 4 +- .../interface/generic_call_generic.carbon | 2 - .../interface/generic_with_two_params.carbon | 2 - explorer/testdata/interface/impl_as.carbon | 2 - .../interface/impl_as_not_self.carbon | 2 - .../impl_self_interface_parameter.carbon | 2 - .../interface/interface_name_invalid.carbon | 2 - explorer/testdata/interface/omit_self.carbon | 2 - .../param_with_dependent_type.carbon | 2 - .../testdata/interface/parameterized.carbon | 2 - .../interface/tuple_vector_add_scale.carbon | 2 - .../testdata/interface/type_of_type.carbon | 2 - .../interface/vector_point_add_scale.carbon | 2 - explorer/testdata/interface/with_self.carbon | 2 - .../testdata/let/fail_function_args.carbon | 4 +- .../testdata/let/fail_global_assign.carbon | 4 +- .../let/fail_global_named_self.carbon | 4 +- .../testdata/let/fail_local_assign.carbon | 4 +- .../testdata/let/fail_local_named_self.carbon | 4 +- .../testdata/let/fail_match_choice.carbon | 4 +- explorer/testdata/let/fail_method_args.carbon | 4 +- .../let/fail_tuple_pattern_let_context.carbon | 4 +- ...il_tuple_pattern_let_context_nested.carbon | 4 +- .../let/fail_tuple_pattern_let_in_var.carbon | 4 +- .../testdata/let/implicit_conversion.carbon | 2 - .../let/implicit_conversion_choice.carbon | 2 - .../testdata/let/nested_tuple_pattern.carbon | 2 - explorer/testdata/limits/README.md | 11 --- explorer/testdata/limits/fail_allocate.carbon | 5 +- .../limits/fail_function_recursion.carbon | 5 +- explorer/testdata/limits/fail_loop.carbon | 5 +- .../limits/fail_type_check_loop.carbon | 5 +- .../testdata/linked_list/linked_list.carbon | 2 - .../linked_list/typed_linked_list.carbon | 3 +- explorer/testdata/match/any_int.carbon | 2 - explorer/testdata/match/convert.carbon | 2 - explorer/testdata/match/exhaustive.carbon | 2 - .../testdata/match/exhaustive_bool.carbon | 2 - .../match/exhaustive_exponential_8x.carbon | 2 - .../exhaustive_exponential_series_t.carbon | 2 - .../fail_exhaustive_exponential_9x.carbon | 4 +- ...ail_exhaustive_exponential_series_t.carbon | 4 +- .../testdata/match/fail_exhaustive_int.carbon | 4 +- .../match/fail_not_alternative.carbon | 4 +- .../testdata/match/fail_not_exhaustive.carbon | 4 +- .../testdata/match/fail_not_reachable.carbon | 4 +- .../match/fail_not_reachable_default.carbon | 4 +- .../match/fail_pattern_type_mismatch.carbon | 4 +- .../testdata/match/fail_redundant_int.carbon | 4 +- explorer/testdata/match/int.carbon | 2 - explorer/testdata/match/int_default.carbon | 2 - explorer/testdata/match/no_match.carbon | 2 - explorer/testdata/match/placeholder.carbon | 2 - explorer/testdata/member_access/arrow.carbon | 2 - .../member_access/convert_lhs_class.carbon | 2 - .../convert_lhs_interface.carbon | 2 - .../member_access/convert_lhs_struct.carbon | 2 - .../evaluate_type_before_dot.carbon | 2 - .../fail_qualified_non_member.carbon | 4 +- .../member_access/fail_vacuous_access.carbon | 4 +- .../fail_vacuous_access_via_type_param.carbon | 4 +- ...rly_vacuous_access_with_impl_lookup.carbon | 2 - ...acuous_access_with_instance_binding.carbon | 2 - .../param_qualified_interface_member.carbon | 2 - .../qualified_class_member.carbon | 2 - .../qualified_constraint_member.carbon | 2 - .../qualified_interface_member.carbon | 2 - .../qualified_param_member.carbon | 2 - .../qualified_struct_member.carbon | 2 - .../type_qualified_interface_member.carbon | 2 - .../mixin/fail_circular_mixing.carbon | 4 +- .../mixin/fail_field_member_name_clash.carbon | 4 +- .../fail_method_member_name_clash.carbon | 4 +- .../mixin/fail_mix_as_type_expr.carbon | 4 +- .../mixin/fail_mix_diamond_clash.carbon | 4 +- .../testdata/mixin/fail_mix_in_global.carbon | 4 +- .../testdata/mixin/fail_mix_in_impl.carbon | 4 +- .../testdata/mixin/fail_mix_invalid.carbon | 4 +- .../mixin/fail_mix_invalid_array.carbon | 4 +- .../mixin/fail_mix_members_clash.carbon | 4 +- .../mixin/fail_qualified_method.carbon | 4 +- .../mixin/fail_recursive_mixing.carbon | 4 +- .../mixin/fail_self_substitution.carbon | 4 +- .../testdata/mixin/self_substitution.carbon | 2 - .../testdata/mixin/simple_mix_in_mixin.carbon | 2 - explorer/testdata/mixin/simple_reuse.carbon | 2 - .../use_mixin_method_in_class_method.carbon | 2 - .../name_lookup/class_fn_body_reorder.carbon | 2 - .../name_lookup/fail_block_duplicate.carbon | 4 +- .../name_lookup/fail_choice_duplicate.carbon | 4 +- .../name_lookup/fail_class_duplicate.carbon | 4 +- ...ail_class_fn_use_before_declaration.carbon | 4 +- .../fail_class_use_in_params.carbon | 4 +- .../name_lookup/fail_fn_use_in_param.carbon | 4 +- .../fail_fn_use_in_return_type.carbon | 4 +- .../name_lookup/fail_global_duplicate.carbon | 4 +- .../fail_use_before_declare.carbon | 4 +- .../fail_var_use_before_declaration.carbon | 4 +- .../testdata/name_lookup/global_shadow.carbon | 2 - .../testdata/name_lookup/match_shadow.carbon | 2 - .../testdata/named_constraint/extends.carbon | 2 - .../fail_associated_constant.carbon | 4 +- .../fail_associated_function.carbon | 4 +- .../fail_compound_member_access.carbon | 4 +- .../fail_impl_as_member_access.carbon | 4 +- .../testdata/named_constraint/impl_as.carbon | 2 - .../named_constraint/impl_constraint.carbon | 2 - .../namespace/builtin_in_namespace.carbon | 2 - explorer/testdata/namespace/declare.carbon | 2 - .../fail_members_not_in_outer_scope.carbon | 4 +- .../namespace/fail_missing_nested.carbon | 4 +- .../fail_qualifier_not_namespace.carbon | 4 +- .../namespace/fail_unknown_member.carbon | 4 +- .../namespace/fail_unknown_namespace.carbon | 4 +- .../namespace/fail_use_as_expression.carbon | 4 +- .../namespace/fail_use_as_value.carbon | 4 +- .../namespace/generic_parameter_scope.carbon | 2 - .../testdata/namespace/lookup_scope.carbon | 2 - explorer/testdata/namespace/members.carbon | 2 - explorer/testdata/operators/add.carbon | 2 - .../testdata/operators/add_builtin.carbon | 2 - explorer/testdata/operators/add_with.carbon | 2 - .../testdata/operators/assign_builtin.carbon | 2 - explorer/testdata/operators/bit_and.carbon | 2 - .../testdata/operators/bit_complement.carbon | 2 - explorer/testdata/operators/bit_or.carbon | 2 - explorer/testdata/operators/bit_xor.carbon | 2 - explorer/testdata/operators/bitwise.carbon | 2 - explorer/testdata/operators/combine.carbon | 2 - explorer/testdata/operators/div.carbon | 2 - .../testdata/operators/div_builtin.carbon | 2 - .../operators/fail_combine_lhs.carbon | 4 +- .../operators/fail_combine_rhs.carbon | 4 +- .../operators/fail_div_by_zero.carbon | 4 +- .../fail_left_shift_large_rhs.carbon | 4 +- .../fail_left_shift_negative_rhs.carbon | 4 +- .../operators/fail_mod_by_zero.carbon | 4 +- .../testdata/operators/fail_no_add.carbon | 4 +- .../testdata/operators/fail_no_mul.carbon | 4 +- .../testdata/operators/fail_no_negate.carbon | 4 +- .../testdata/operators/fail_no_sub.carbon | 4 +- .../operators/fail_overflow_add.carbon | 4 +- .../operators/fail_overflow_div.carbon | 4 +- .../operators/fail_overflow_multiply.carbon | 4 +- .../operators/fail_overflow_sub.carbon | 4 +- .../fail_right_shift_large_rhs.carbon | 4 +- .../fail_right_shift_negative_rhs.carbon | 4 +- explorer/testdata/operators/inc_dec.carbon | 2 - explorer/testdata/operators/left_shift.carbon | 2 - explorer/testdata/operators/mod.carbon | 2 - .../testdata/operators/mod_builtin.carbon | 2 - explorer/testdata/operators/mod_edges.carbon | 2 - explorer/testdata/operators/mul.carbon | 2 - .../testdata/operators/mul_builtin.carbon | 2 - explorer/testdata/operators/negate.carbon | 2 - .../testdata/operators/negate_builtin.carbon | 2 - .../testdata/operators/right_shift.carbon | 2 - explorer/testdata/operators/shift.carbon | 2 - .../operators/shortcircuit_and.carbon | 2 - .../shortcircuit_and_no_shortcircuit.carbon | 2 - .../testdata/operators/shortcircuit_or.carbon | 2 - .../shortcircuit_or_no_shortcircuit.carbon | 2 - explorer/testdata/operators/sub.carbon | 2 - .../testdata/operators/sub_builtin.carbon | 2 - .../optional/fail_optional_get_empty.carbon | 4 +- .../init_optional_with_non_value.carbon | 2 - .../optional/init_optional_with_value.carbon | 2 - explorer/testdata/package/fail_missing.carbon | 4 +- explorer/testdata/package/with_library.carbon | 2 - explorer/testdata/pointer/aliasing.carbon | 2 - explorer/testdata/pointer/basic.carbon | 2 - .../pointer/fail_delete_uninit.carbon | 4 +- .../fail_intrinsic_delete_no_args.carbon | 4 +- .../pointer/fail_intrinsic_delete_type.carbon | 4 +- .../pointer/fail_intrinsic_new_no_args.carbon | 4 +- .../fail_invalid_ptr_conversion1.carbon | 4 +- .../fail_invalid_ptr_conversion2.carbon | 4 +- .../pointer/fail_rvalue_addressof.carbon | 4 +- .../pointer/fail_use_after_free.carbon | 4 +- .../pointer/heap_alloc_lifetime.carbon | 2 - .../testdata/pointer/intrinsic_new.carbon | 2 - .../testdata/pointer/new_and_delete.carbon | 2 - .../pointer/new_and_delete_class.carbon | 2 - .../testdata/pointer/new_and_delete_fn.carbon | 2 - .../pointer/pointer_to_type_like.carbon | 2 - .../testdata/pointer/struct_pointer.carbon | 2 - .../testdata/pointer/tuple_pointer.carbon | 2 - .../testdata/print/associated_constant.carbon | 2 - explorer/testdata/print/escaped_brace.carbon | 2 - .../testdata/print/fail_index_bounds0.carbon | 4 +- .../testdata/print/fail_index_bounds1.carbon | 4 +- .../testdata/print/fail_index_empty.carbon | 4 +- .../print/fail_index_incomplete.carbon | 4 +- .../testdata/print/fail_index_limit.carbon | 4 +- .../testdata/print/fail_index_negative.carbon | 4 +- .../testdata/print/fail_index_text.carbon | 4 +- .../print/fail_intrinsic_int_format.carbon | 4 +- .../print/fail_intrinsic_no_args.carbon | 4 +- .../print/fail_intrinsic_too_many_args.carbon | 4 +- .../testdata/print/fail_intrinsic_type.carbon | 4 +- explorer/testdata/print/fail_no_args.carbon | 4 +- explorer/testdata/print/fail_not_str.carbon | 4 +- .../testdata/print/fail_single_brace.carbon | 4 +- .../testdata/print/fail_too_many_args.carbon | 4 +- explorer/testdata/print/fail_type.carbon | 4 +- explorer/testdata/print/format_only.carbon | 2 - explorer/testdata/print/i32.carbon | 2 - explorer/testdata/print/long_index.carbon | 2 - .../testdata/random/fail_empty_range.carbon | 4 +- .../random/fail_intrinsic_no_args.carbon | 4 +- .../random/fail_intrinsic_type0.carbon | 4 +- .../random/fail_intrinsic_type1.carbon | 4 +- .../testdata/random/fail_reverse_range.carbon | 4 +- explorer/testdata/random/max_range.carbon | 2 - explorer/testdata/random/random.carbon | 2 - .../return/convert_return_value.carbon | 2 - .../testdata/return/explicit_empty.carbon | 2 - .../fail_explicit_with_no_return.carbon | 4 +- .../fail_explicit_with_plain_return.carbon | 4 +- .../fail_implicit_with_explicit_return.carbon | 4 +- .../return/implicit_with_no_return.carbon | 2 - .../return/implicit_with_plain_return.carbon | 2 - explorer/testdata/string/basic.carbon | 2 - explorer/testdata/string/block.carbon | 2 - .../string/block_escaped_triple_quotes.carbon | 2 - .../string/block_file_type_indicator.carbon | 2 - .../fail_block_quotes_not_on_own_line.carbon | 4 +- .../testdata/string/fail_hex_lower.carbon | 4 +- .../testdata/string/fail_hex_truncated.carbon | 4 +- .../string/fail_invalid_escape.carbon | 4 +- explorer/testdata/string/fail_newline.carbon | 4 +- explorer/testdata/string/fail_octal.carbon | 4 +- ...il_raw_block_more_hash_tags_on_left.carbon | 4 +- ...l_raw_block_more_hash_tags_on_right.carbon | 4 +- ...il_raw_block_quotes_not_on_own_line.carbon | 4 +- .../string/fail_raw_block_single_line.carbon | 4 +- .../fail_raw_more_hash_tags_on_left.carbon | 4 +- .../fail_raw_more_hash_tags_on_right.carbon | 4 +- explorer/testdata/string/fail_tab.carbon | 4 +- explorer/testdata/string/hex.carbon | 2 - explorer/testdata/string/newline.carbon | 2 - explorer/testdata/string/raw_basic.carbon | 2 - .../string/raw_basic_multi_hashtag.carbon | 2 - explorer/testdata/string/raw_block.carbon | 2 - .../raw_block_escaped_back_slash.carbon | 2 - .../raw_block_escaped_triple_quotes.carbon | 2 - explorer/testdata/string/raw_nesting.carbon | 2 - explorer/testdata/string/unicode.carbon | 2 - explorer/testdata/struct/assign.carbon | 2 - explorer/testdata/struct/assign_member.carbon | 2 - explorer/testdata/struct/empty.carbon | 2 - explorer/testdata/struct/ending_comma.carbon | 2 - explorer/testdata/struct/equality.carbon | 2 - .../testdata/struct/equality_false.carbon | 2 - .../struct/fail_assign_different_types.carbon | 4 +- .../testdata/struct/fail_equality_type.carbon | 4 +- .../struct/fail_field_access_mismatch.carbon | 4 +- ...ail_struct_literal_duplicate_member.carbon | 4 +- ...truct_type_literal_duplicate_member.carbon | 4 +- .../struct/field_convertible_to_type.carbon | 2 - explorer/testdata/struct/name_order.carbon | 2 - explorer/testdata/struct/temp.carbon | 2 - explorer/testdata/struct/var.carbon | 2 - .../testdata/template/fail_name_lookup.carbon | 4 +- .../testdata/template/fail_no_member.carbon | 4 +- .../testdata/template/member_access.carbon | 2 - explorer/testdata/template/name_lookup.carbon | 2 - explorer/testdata/tuple/convert.carbon | 2 - explorer/testdata/tuple/ending_comma.carbon | 2 - explorer/testdata/tuple/equality.carbon | 2 - explorer/testdata/tuple/equality_false.carbon | 2 - .../testdata/tuple/fail_equality_type.carbon | 4 +- .../fail_implicit_convert_with_as.carbon | 4 +- explorer/testdata/tuple/fail_index.carbon | 4 +- explorer/testdata/tuple/fail_index_var.carbon | 4 +- .../fail_length_mismatch_with_auto.carbon | 4 +- .../tuple/fail_nontype_tuple_as_type.carbon | 4 +- explorer/testdata/tuple/fail_to_array.carbon | 4 +- .../tuple/fail_type_tuple_as_type.carbon | 4 +- .../tuple/fail_unexpected_tuple.carbon | 4 +- explorer/testdata/tuple/index.carbon | 2 - explorer/testdata/tuple/match.carbon | 2 - explorer/testdata/tuple/match_nested.carbon | 2 - .../testdata/tuple/no_ending_comma.carbon | 2 - explorer/testdata/tuple/to_array.carbon | 2 - explorer/testdata/tuple/to_type.carbon | 2 - .../control_flow_defer_to_dynamic.carbon | 2 - .../unformed/destroy_formed_only.carbon | 2 - .../unformed/dynamic/fail_global.carbon | 4 +- .../unformed/dynamic/fail_param.carbon | 4 +- .../dynamic/fail_pattern_declare.carbon | 4 +- .../unformed/dynamic/fail_return.carbon | 4 +- .../unformed/dynamic/fail_returned_var.carbon | 4 +- .../unformed/dynamic/fail_rhs_assign.carbon | 4 +- .../unformed/global_assign_before_use.carbon | 2 - .../testdata/unformed/global_escape.carbon | 2 - .../global_unformed_without_use.carbon | 2 - .../unformed/local_assign_before_use.carbon | 2 - .../testdata/unformed/local_escape.carbon | 2 - .../local_unformed_without_use.carbon | 2 - .../testdata/unformed/pattern_declare.carbon | 2 - .../returned_var_assign_before_use.carbon | 2 - .../static/fail_compound_assign.carbon | 4 +- .../unformed/static/fail_field_value.carbon | 4 +- .../unformed/static/fail_if_cond.carbon | 4 +- .../unformed/static/fail_if_else.carbon | 4 +- .../unformed/static/fail_if_then.carbon | 4 +- .../unformed/static/fail_increment.carbon | 4 +- .../static/fail_local_pattern_declare.carbon | 4 +- .../static/fail_local_rhs_assign.carbon | 4 +- .../unformed/static/fail_match_clause.carbon | 4 +- .../static/fail_match_expression.carbon | 4 +- .../unformed/static/fail_param.carbon | 4 +- .../unformed/static/fail_return.carbon | 4 +- .../unformed/static/fail_returned_var.carbon | 4 +- .../unformed/static/fail_rhs_def.carbon | 4 +- .../static/fail_struct_member_access.carbon | 4 +- .../unformed/static/fail_while_body.carbon | 4 +- .../unformed/static/fail_while_cond.carbon | 4 +- .../var/global/fail_init_type_mismatch.carbon | 4 +- .../fail_instantiate_global_abstract.carbon | 4 +- .../global/fail_invalid_var_expression.carbon | 4 +- .../fail_modify_in_constant_expr.carbon | 4 +- .../var/global/fail_named_self.carbon | 4 +- .../var/global/fail_nested_binding.carbon | 4 +- .../testdata/var/global/fail_type_only.carbon | 4 +- .../var/global/implicit_conversion.carbon | 2 - .../testdata/var/global/init_and_read.carbon | 2 - .../var/global/init_from_function.carbon | 2 - .../testdata/var/global/init_order.carbon | 2 - explorer/testdata/var/global/shadowing.carbon | 2 - explorer/testdata/var/global/write.carbon | 2 - .../var/global/write_from_function.carbon | 2 - .../local/fail_generic_binding_in_type.carbon | 4 +- .../var/local/fail_missing_intro.carbon | 4 +- .../var/local/fail_named_self_type.carbon | 4 +- .../local/fail_nested_binding_in_type.carbon | 4 +- .../var/local/fail_nested_type_only.carbon | 4 +- .../testdata/var/local/fail_type_only.carbon | 4 +- .../var/local/fail_value_as_type.carbon | 4 +- .../testdata/var/local/nested_binding.carbon | 2 - .../testdata/var/local/placeholder.carbon | 2 - explorer/testdata/var/local/use_value.carbon | 2 - .../returned/fail_duplicate_return_var.carbon | 4 +- .../returned/fail_missing_declaration.carbon | 4 +- .../var/returned/fail_missing_return.carbon | 4 +- ...ail_returned_var_mismatch_signature.carbon | 4 +- .../fail_returned_var_multi_auto.carbon | 4 +- .../fail_returned_var_type_mismatch.carbon | 4 +- .../multiple_returned_var_control_flow.carbon | 2 - .../normal_return_control_flow.carbon | 2 - .../var/returned/returned_var_auto.carbon | 2 - .../var/returned/returned_var_basic.carbon | 2 - .../returned/returned_var_name_lookup.carbon | 2 - .../returned_var_omitted_expression.carbon | 2 - explorer/testdata/while/basic.carbon | 2 - explorer/testdata/while/break.carbon | 2 - explorer/testdata/while/continue.carbon | 2 - .../testdata/while/convert_condition.carbon | 2 - 763 files changed, 556 insertions(+), 1899 deletions(-) create mode 100644 explorer/file_test.cpp create mode 100755 explorer/lit_autoupdate_lit.py rename explorer/{testdata => lit_testdata}/BUILD (87%) create mode 100644 explorer/lit_testdata/hello.carbon rename explorer/{testdata => lit_testdata}/lit.cfg.py (100%) rename explorer/{testdata/basic_syntax => lit_testdata}/trace.carbon (100%) rename explorer/{testdata/basic_syntax => lit_testdata}/zero.carbon (100%) delete mode 100644 explorer/testdata/limits/README.md diff --git a/explorer/BUILD b/explorer/BUILD index 9ce363327793..4576f018a764 100644 --- a/explorer/BUILD +++ b/explorer/BUILD @@ -3,6 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception load("//bazel/cc_toolchains:defs.bzl", "cc_env") +load("//bazel/sh_run:rules.bzl", "glob_sh_run") +load("//testing/file_test:rules.bzl", "file_test") package(default_visibility = [ "//bazel/check_deps:__pkg__", @@ -37,3 +39,40 @@ cc_binary( "@llvm-project//llvm:Support", ], ) + +file_test( + name = "file_test", + srcs = ["file_test.cpp"], + # Bazel limits sharding to 50. We have lots of tests, so this should + # maximize parallelism. + shard_count = 50, + tests = glob(["testdata/**/*.carbon"]), + deps = [ + "//explorer/parse_and_execute", + "//testing/file_test:file_test_base", + ], +) + +glob_sh_run( + args = ["$(location //explorer)"], + data = ["//explorer"], + file_exts = ["carbon"], +) + +glob_sh_run( + args = [ + "$(location //explorer)", + "--parser_debug", + "--trace_file=-", + ], + data = ["//explorer"], + file_exts = ["carbon"], + run_ext = "verbose", +) + +filegroup( + name = "carbon_files", + srcs = glob(["testdata/**/*.carbon"]), + # Files are used for validating fuzzer completeness. + visibility = ["//explorer/fuzzing:__pkg__"], +) diff --git a/explorer/file_test.cpp b/explorer/file_test.cpp new file mode 100644 index 000000000000..c1ab4782ded8 --- /dev/null +++ b/explorer/file_test.cpp @@ -0,0 +1,82 @@ +// 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 + +#include "explorer/parse_and_execute/parse_and_execute.h" +#include "testing/file_test/file_test_base.h" + +namespace Carbon::Testing { +namespace { + +static constexpr char PreludePath[] = "explorer/data/prelude.carbon"; + +class ParseAndExecuteTestFile : public FileTestBase { + public: + explicit ParseAndExecuteTestFile(llvm::StringRef path, bool trace) + : FileTestBase(path), trace_(trace) {} + + auto SetUp() -> void override { + if (trace_) { + if (path().find("/limits/") != llvm::StringRef::npos) { + GTEST_SKIP() + << "`limits` tests check for various limit conditions (such as an " + "infinite loop). The tests collectively don't test tracing " + "because it creates substantial additional overhead."; + } else if (path().endswith( + "testdata/assoc_const/rewrite_large_type.carbon") || + path().endswith( + "testdata/linked_list/typed_linked_list.carbon")) { + GTEST_SKIP() << "Expensive test to trace"; + } + } + } + + auto RunOverFile(llvm::raw_ostream& stdout, llvm::raw_ostream& stderr) + -> bool override { + // Capture trace streaming, but only when in debug mode. + TraceStream trace_stream; + std::string trace_stream_str; + llvm::raw_string_ostream trace_stream_ostream(trace_stream_str); + if (trace_) { + trace_stream.set_stream(&trace_stream_ostream); + } + + // Run the parse. Parser debug output is always off because it's difficult + // to redirect. + auto result = + ParseAndExecuteFile(PreludePath, path().str(), + /*parser_debug=*/false, &trace_stream, &stdout); + // This mirrors printing currently done by main.cpp. + if (result.ok()) { + stdout << "result: " << *result << "\n"; + } else { + stderr << result.error() << "\n"; + } + + if (trace_) { + EXPECT_FALSE(trace_stream_str.empty()) + << "Tracing should always do something"; + } + + return result.ok(); + } + + private: + bool trace_; +}; + +} // namespace + +extern auto RegisterFileTests(const std::vector& paths) + -> void { + ParseAndExecuteTestFile::RegisterTests( + "ParseAndExecuteTestFile", paths, [=](llvm::StringRef path) { + return new ParseAndExecuteTestFile(path, /*trace=*/false); + }); + ParseAndExecuteTestFile::RegisterTests( + "ParseAndExecuteTestFile.trace", paths, [=](llvm::StringRef path) { + return new ParseAndExecuteTestFile(path, /*trace=*/true); + }); +} + +} // namespace Carbon::Testing diff --git a/explorer/fuzzing/BUILD b/explorer/fuzzing/BUILD index 15b19a5fadf6..808f98b084a3 100644 --- a/explorer/fuzzing/BUILD +++ b/explorer/fuzzing/BUILD @@ -37,11 +37,11 @@ cc_test( srcs = ["ast_to_proto_test.cpp"], args = [ "$(locations //explorer:standard_libraries)", - "$(locations //explorer/testdata:carbon_files)", + "$(locations //explorer:carbon_files)", ], data = [ + "//explorer:carbon_files", "//explorer:standard_libraries", - "//explorer/testdata:carbon_files", ], deps = [ ":ast_to_proto_lib", diff --git a/explorer/interpreter/interpreter.cpp b/explorer/interpreter/interpreter.cpp index cabeb1e20040..b42062987052 100644 --- a/explorer/interpreter/interpreter.cpp +++ b/explorer/interpreter/interpreter.cpp @@ -2440,15 +2440,15 @@ auto Interpreter::Step() -> ErrorOr { // Check for various overflow conditions before stepping. if (todo_.size() > MaxTodoSize) { return ProgramError(SourceLocation("overflow", 1)) - << "Stack overflow: too many interpreter actions on stack"; + << "stack overflow: too many interpreter actions on stack"; } if (++steps_taken_ > MaxStepsTaken) { return ProgramError(SourceLocation("overflow", 1)) - << "Possible infinite loop: too many interpreter steps executed"; + << "possible infinite loop: too many interpreter steps executed"; } if (arena_->allocated() > MaxArenaAllocated) { return ProgramError(SourceLocation("overflow", 1)) - << "Out of memory: exceeded arena allocation limit"; + << "out of memory: exceeded arena allocation limit"; } Action& act = todo_.CurrentAction(); diff --git a/explorer/lit_autoupdate.py b/explorer/lit_autoupdate.py index 202e69b38ab2..f996a25c6be5 100755 --- a/explorer/lit_autoupdate.py +++ b/explorer/lit_autoupdate.py @@ -25,8 +25,6 @@ def main() -> None: # Flags to configure for explorer testing. "--tool=explorer", "--testdata=explorer/testdata", - "--lit_run=%{explorer-run}", - "--lit_run=%{explorer-run-trace}", ] + sys.argv[1:] os.execv(actual_py, args) diff --git a/explorer/lit_autoupdate_lit.py b/explorer/lit_autoupdate_lit.py new file mode 100755 index 000000000000..b536e09890c1 --- /dev/null +++ b/explorer/lit_autoupdate_lit.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python3 + +"""Updates the CHECK: lines in lit tests based on the AUTOUPDATE line.""" + +__copyright__ = """ +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 +""" + +import os +import sys +from pathlib import Path + + +def main() -> None: + # Calls the main script using execv in order to avoid Python import + # behaviors. + this_py = Path(__file__).resolve() + actual_py = this_py.parent.parent.joinpath( + "bazel", "testing", "lit_autoupdate_base.py" + ) + args = [ + sys.argv[0], + # Flags to configure for explorer testing. + "--tool=explorer", + "--testdata=explorer/lit_testdata", + "--lit_run=%{explorer-run}", + "--lit_run=%{explorer-run-trace}", + ] + sys.argv[1:] + os.execv(actual_py, args) + + +if __name__ == "__main__": + main() diff --git a/explorer/testdata/BUILD b/explorer/lit_testdata/BUILD similarity index 87% rename from explorer/testdata/BUILD rename to explorer/lit_testdata/BUILD index df7450ee5c84..e069bd6a770e 100644 --- a/explorer/testdata/BUILD +++ b/explorer/lit_testdata/BUILD @@ -32,9 +32,3 @@ glob_sh_run( file_exts = ["carbon"], run_ext = "verbose", ) - -filegroup( - name = "carbon_files", - srcs = glob(["**/*.carbon"]), - visibility = ["//visibility:public"], -) diff --git a/explorer/lit_testdata/hello.carbon b/explorer/lit_testdata/hello.carbon new file mode 100644 index 000000000000..dcff2f59d57c --- /dev/null +++ b/explorer/lit_testdata/hello.carbon @@ -0,0 +1,16 @@ +// 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 +// +// AUTOUPDATE +// RUN: %{explorer-run} +// RUN: %{explorer-run-trace} +// CHECK:STDOUT: Hello +// CHECK:STDOUT: result: 0 + +package ExplorerTest api; + +fn Main() -> i32 { + Print("Hello"); + return 0; +} diff --git a/explorer/testdata/lit.cfg.py b/explorer/lit_testdata/lit.cfg.py similarity index 100% rename from explorer/testdata/lit.cfg.py rename to explorer/lit_testdata/lit.cfg.py diff --git a/explorer/testdata/basic_syntax/trace.carbon b/explorer/lit_testdata/trace.carbon similarity index 100% rename from explorer/testdata/basic_syntax/trace.carbon rename to explorer/lit_testdata/trace.carbon diff --git a/explorer/testdata/basic_syntax/zero.carbon b/explorer/lit_testdata/zero.carbon similarity index 100% rename from explorer/testdata/basic_syntax/zero.carbon rename to explorer/lit_testdata/zero.carbon diff --git a/explorer/parse_and_execute/BUILD b/explorer/parse_and_execute/BUILD index 93eb002126f1..f28ae3d9361a 100644 --- a/explorer/parse_and_execute/BUILD +++ b/explorer/parse_and_execute/BUILD @@ -2,8 +2,6 @@ # Exceptions. See /LICENSE for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -load("//bazel/cc_toolchains:defs.bzl", "cc_env") - package(default_visibility = [ "//explorer:__pkg__", "//explorer/fuzzing:__pkg__", diff --git a/explorer/testdata/addr/fail_method_let.carbon b/explorer/testdata/addr/fail_method_let.carbon index 417bc6683173..57a54f5f0ebf 100644 --- a/explorer/testdata/addr/fail_method_let.carbon +++ b/explorer/testdata/addr/fail_method_let.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -26,7 +24,7 @@ class Point { fn Main() -> i32 { let p: Point = Point.Origin(); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/addr/fail_method_let.carbon:[[@LINE+1]]: method p.GetSetX requires its receiver to be a reference expression + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/addr/fail_method_let.carbon:[[@LINE+1]]: method p.GetSetX requires its receiver to be a reference expression var x: auto = p.GetSetX(42); if (p.x == 42) { return x; diff --git a/explorer/testdata/addr/fail_method_self_misspelled.carbon b/explorer/testdata/addr/fail_method_self_misspelled.carbon index 3add9d679873..bbc6a71c6fd4 100644 --- a/explorer/testdata/addr/fail_method_self_misspelled.carbon +++ b/explorer/testdata/addr/fail_method_self_misspelled.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class C { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/addr/fail_method_self_misspelled.carbon:[[@LINE+1]]: illegal binding pattern in implicit parameter list + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/addr/fail_method_self_misspelled.carbon:[[@LINE+1]]: illegal binding pattern in implicit parameter list fn F[addr slef: Self*]() {} } diff --git a/explorer/testdata/addr/fail_method_self_type.carbon b/explorer/testdata/addr/fail_method_self_type.carbon index 71f83ebe3a5f..b88ac864d780 100644 --- a/explorer/testdata/addr/fail_method_self_type.carbon +++ b/explorer/testdata/addr/fail_method_self_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -30,7 +28,7 @@ class Point { fn Main() -> i32 { var p: Point = Point.Origin(); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/addr/fail_method_self_type.carbon:[[@LINE+3]]: type error in method access, receiver type + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/addr/fail_method_self_type.carbon:[[@LINE+3]]: type error in method access, receiver type // CHECK:STDERR: expected: class Shape // CHECK:STDERR: actual: class Point var x: auto = p.GetSetX(42); diff --git a/explorer/testdata/addr/method.carbon b/explorer/testdata/addr/method.carbon index 6d577b8a8aaa..fef82e3fd2a6 100644 --- a/explorer/testdata/addr/method.carbon +++ b/explorer/testdata/addr/method.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/addr/nested_method.carbon b/explorer/testdata/addr/nested_method.carbon index 3f4d3a71c063..fe1792b39c8a 100644 --- a/explorer/testdata/addr/nested_method.carbon +++ b/explorer/testdata/addr/nested_method.carbon @@ -4,8 +4,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/alias/alias_in_class.carbon b/explorer/testdata/alias/alias_in_class.carbon index 4111286bd167..35f46a5c49af 100644 --- a/explorer/testdata/alias/alias_in_class.carbon +++ b/explorer/testdata/alias/alias_in_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/alias/class_alias.carbon b/explorer/testdata/alias/class_alias.carbon index 9b45598ea0ce..1076942aa0a8 100644 --- a/explorer/testdata/alias/class_alias.carbon +++ b/explorer/testdata/alias/class_alias.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: b.n: 1 // CHECK:STDOUT: d.Get(0): 2 // CHECK:STDOUT: e.Get(1): 3 diff --git a/explorer/testdata/alias/fail_alias_expression.carbon b/explorer/testdata/alias/fail_alias_expression.carbon index 1a751587f74c..d9a1ad9dd4f0 100644 --- a/explorer/testdata/alias/fail_alias_expression.carbon +++ b/explorer/testdata/alias/fail_alias_expression.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/alias/fail_alias_expression.carbon:[[@LINE+1]]: invalid target for alias declaration +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/alias/fail_alias_expression.carbon:[[@LINE+1]]: invalid target for alias declaration alias A = 5; fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/alias/fail_alias_var.carbon b/explorer/testdata/alias/fail_alias_var.carbon index 1356a499b2fe..051fd10575e7 100644 --- a/explorer/testdata/alias/fail_alias_var.carbon +++ b/explorer/testdata/alias/fail_alias_var.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; var v: i32; // TODO: This should probably be valid if we allow global variables at all. -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/alias/fail_alias_var.carbon:[[@LINE+1]]: invalid target for alias declaration +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/alias/fail_alias_var.carbon:[[@LINE+1]]: invalid target for alias declaration alias A = v; fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/alias/fail_interface_method_as_class_member.carbon b/explorer/testdata/alias/fail_interface_method_as_class_member.carbon index d46402e5a671..648140477b04 100644 --- a/explorer/testdata/alias/fail_interface_method_as_class_member.carbon +++ b/explorer/testdata/alias/fail_interface_method_as_class_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -35,7 +33,7 @@ impl forall [U:! Printable] Vector(U) as Printable { fn Main() -> i32 { var v: Vector(String) = {.x = "test"}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/alias/fail_interface_method_as_class_member.carbon:[[@LINE+1]]: Member access to aliases is not yet supported. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/alias/fail_interface_method_as_class_member.carbon:[[@LINE+1]]: Member access to aliases is not yet supported. v.PrintIt(); return 42; } diff --git a/explorer/testdata/alias/fail_namespace_alias_member.carbon b/explorer/testdata/alias/fail_namespace_alias_member.carbon index eca486e20f45..a4f37466c91a 100644 --- a/explorer/testdata/alias/fail_namespace_alias_member.carbon +++ b/explorer/testdata/alias/fail_namespace_alias_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ namespace N; alias M = N; // TODO: It's unclear whether this should be permitted. If not, we should // produce a better diagnostic. -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/alias/fail_namespace_alias_member.carbon:[[@LINE+1]]: alias M cannot be used as a name qualifier +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/alias/fail_namespace_alias_member.carbon:[[@LINE+1]]: alias M cannot be used as a name qualifier fn M.F() {} fn Main() -> i32 { diff --git a/explorer/testdata/alias/fail_self_alias.carbon b/explorer/testdata/alias/fail_self_alias.carbon index d9a5462907b6..582b202de0da 100644 --- a/explorer/testdata/alias/fail_self_alias.carbon +++ b/explorer/testdata/alias/fail_self_alias.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/alias/fail_self_alias.carbon:[[@LINE+1]]: 'a' is not usable until after it has been completely declared +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/alias/fail_self_alias.carbon:[[@LINE+1]]: 'a' is not usable until after it has been completely declared alias a = a; fn Main() -> i32 { diff --git a/explorer/testdata/alias/fail_wrong_fn_alias_use.carbon b/explorer/testdata/alias/fail_wrong_fn_alias_use.carbon index a10f0cd121ce..c8d98065f776 100644 --- a/explorer/testdata/alias/fail_wrong_fn_alias_use.carbon +++ b/explorer/testdata/alias/fail_wrong_fn_alias_use.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn F() {} alias A = F; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/alias/fail_wrong_fn_alias_use.carbon:[[@LINE+1]]: alias A cannot be used as a name qualifier +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/alias/fail_wrong_fn_alias_use.carbon:[[@LINE+1]]: alias A cannot be used as a name qualifier fn A.Foo() {} fn Main() -> i32 { diff --git a/explorer/testdata/alias/fail_wrong_fn_alias_use_expr.carbon b/explorer/testdata/alias/fail_wrong_fn_alias_use_expr.carbon index 3e11eef16f0d..9e7cc178f311 100644 --- a/explorer/testdata/alias/fail_wrong_fn_alias_use_expr.carbon +++ b/explorer/testdata/alias/fail_wrong_fn_alias_use_expr.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,6 +10,6 @@ fn F() {} alias A = F; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/alias/fail_wrong_fn_alias_use_expr.carbon:[[@LINE+1]]: member access, unexpected fn () -> () in A.x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/alias/fail_wrong_fn_alias_use_expr.carbon:[[@LINE+1]]: member access, unexpected fn () -> () in A.x return A.x; } diff --git a/explorer/testdata/alias/fail_wrong_interface_alias_use.carbon b/explorer/testdata/alias/fail_wrong_interface_alias_use.carbon index ba946b6d19fd..9eac3492aac2 100644 --- a/explorer/testdata/alias/fail_wrong_interface_alias_use.carbon +++ b/explorer/testdata/alias/fail_wrong_interface_alias_use.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,6 +10,6 @@ interface Foo {} alias A = Foo; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/alias/fail_wrong_interface_alias_use.carbon:[[@LINE+1]]: member access, bar not in interface Foo + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/alias/fail_wrong_interface_alias_use.carbon:[[@LINE+1]]: member access, bar not in interface Foo return A.bar; } diff --git a/explorer/testdata/alias/fail_wrong_namepsace_alias_use.carbon b/explorer/testdata/alias/fail_wrong_namepsace_alias_use.carbon index 77ee8fe745df..73198c09b7d1 100644 --- a/explorer/testdata/alias/fail_wrong_namepsace_alias_use.carbon +++ b/explorer/testdata/alias/fail_wrong_namepsace_alias_use.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,6 +10,6 @@ namespace Foo; alias A = Foo; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/alias/fail_wrong_namepsace_alias_use.carbon:[[@LINE+1]]: expected `.member_name` after name of namespace Foo + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/alias/fail_wrong_namepsace_alias_use.carbon:[[@LINE+1]]: expected `.member_name` after name of namespace Foo return A; } diff --git a/explorer/testdata/alias/function_alias.carbon b/explorer/testdata/alias/function_alias.carbon index 6578ff0517c3..ab0e3dea94b9 100644 --- a/explorer/testdata/alias/function_alias.carbon +++ b/explorer/testdata/alias/function_alias.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 7 package ExplorerTest api; diff --git a/explorer/testdata/alias/interface_alias.carbon b/explorer/testdata/alias/interface_alias.carbon index a297651b09d7..04240c552684 100644 --- a/explorer/testdata/alias/interface_alias.carbon +++ b/explorer/testdata/alias/interface_alias.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 12345 package ExplorerTest api; diff --git a/explorer/testdata/alias/member_name_alias.carbon b/explorer/testdata/alias/member_name_alias.carbon index a50fab5bf300..c663fc809f11 100644 --- a/explorer/testdata/alias/member_name_alias.carbon +++ b/explorer/testdata/alias/member_name_alias.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/alias/namespace_alias.carbon b/explorer/testdata/alias/namespace_alias.carbon index 6b6c648157cd..336ede5d3f1b 100644 --- a/explorer/testdata/alias/namespace_alias.carbon +++ b/explorer/testdata/alias/namespace_alias.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/alias/namespace_alias_recursive.carbon b/explorer/testdata/alias/namespace_alias_recursive.carbon index 7171e71a364b..2dabfcf823a6 100644 --- a/explorer/testdata/alias/namespace_alias_recursive.carbon +++ b/explorer/testdata/alias/namespace_alias_recursive.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/alias/struct_alias.carbon b/explorer/testdata/alias/struct_alias.carbon index a8562423ff55..e6b07fcdb4d4 100644 --- a/explorer/testdata/alias/struct_alias.carbon +++ b/explorer/testdata/alias/struct_alias.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: ab.a: 2 // CHECK:STDOUT: ab.b: 1 // CHECK:STDOUT: ba.a: 2 diff --git a/explorer/testdata/alias/type_alias.carbon b/explorer/testdata/alias/type_alias.carbon index 1e1364eea475..625dc56c9858 100644 --- a/explorer/testdata/alias/type_alias.carbon +++ b/explorer/testdata/alias/type_alias.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 4 package ExplorerTest api; diff --git a/explorer/testdata/array/element_convertible_to_type.carbon b/explorer/testdata/array/element_convertible_to_type.carbon index 3b3fc99ff681..ef6978a5c0ea 100644 --- a/explorer/testdata/array/element_convertible_to_type.carbon +++ b/explorer/testdata/array/element_convertible_to_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/array/fail_index.carbon b/explorer/testdata/array/fail_index.carbon index 3f9e1a0e4c86..fb6a0ac7ab69 100644 --- a/explorer/testdata/array/fail_index.carbon +++ b/explorer/testdata/array/fail_index.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: [i32; 2] = (0, 1); - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/array/fail_index.carbon:[[@LINE+1]]: index 2 out of range in (0, 1) + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/array/fail_index.carbon:[[@LINE+1]]: index 2 out of range in (0, 1) return x[2]; } diff --git a/explorer/testdata/array/fail_negative_size.carbon b/explorer/testdata/array/fail_negative_size.carbon index 52abf2407dc9..b473a0d03559 100644 --- a/explorer/testdata/array/fail_negative_size.carbon +++ b/explorer/testdata/array/fail_negative_size.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/array/fail_negative_size.carbon:[[@LINE+1]]: Array size cannot be negative + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/array/fail_negative_size.carbon:[[@LINE+1]]: Array size cannot be negative var x: [i32; -1] = (); return x[0]; } diff --git a/explorer/testdata/array/fail_print_uninitalized_array_element.carbon b/explorer/testdata/array/fail_print_uninitalized_array_element.carbon index 3af29155a5a3..009d387252c7 100644 --- a/explorer/testdata/array/fail_print_uninitalized_array_element.carbon +++ b/explorer/testdata/array/fail_print_uninitalized_array_element.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; fn Main() -> i32 { var my_array : [i32; 1]; - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/array/fail_print_uninitalized_array_element.carbon:[[@LINE+1]]: Printing uninitialized value + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/array/fail_print_uninitalized_array_element.carbon:[[@LINE+1]]: Printing uninitialized value Print("{0}", my_array[0]); return 0; } diff --git a/explorer/testdata/array/fail_size_mismatch.carbon b/explorer/testdata/array/fail_size_mismatch.carbon index dac0903428b4..047c42d92c8e 100644 --- a/explorer/testdata/array/fail_size_mismatch.carbon +++ b/explorer/testdata/array/fail_size_mismatch.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/array/fail_size_mismatch.carbon:[[@LINE+1]]: type error in initializer of variable: '(i32, i32, i32)' is not implicitly convertible to '[i32; 2]' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/array/fail_size_mismatch.carbon:[[@LINE+1]]: type error in initializer of variable: '(i32, i32, i32)' is not implicitly convertible to '[i32; 2]' var x: [i32; 2] = (0, 1, 2); return x[0]; } diff --git a/explorer/testdata/array/index.carbon b/explorer/testdata/array/index.carbon index 42d34586df8c..747b7e8dc9ed 100644 --- a/explorer/testdata/array/index.carbon +++ b/explorer/testdata/array/index.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/array/nested.carbon b/explorer/testdata/array/nested.carbon index 766502b6a382..206753a770b7 100644 --- a/explorer/testdata/array/nested.carbon +++ b/explorer/testdata/array/nested.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/array/uninitialized_global_array_access.carbon b/explorer/testdata/array/uninitialized_global_array_access.carbon index 296b1dfb4b3c..9ba45db5b2ae 100644 --- a/explorer/testdata/array/uninitialized_global_array_access.carbon +++ b/explorer/testdata/array/uninitialized_global_array_access.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 100 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/array/uninitialized_local_array_access.carbon b/explorer/testdata/array/uninitialized_local_array_access.carbon index dd00a0253d47..ec2f93a4558f 100644 --- a/explorer/testdata/array/uninitialized_local_array_access.carbon +++ b/explorer/testdata/array/uninitialized_local_array_access.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 100 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/as/as_same_type.carbon b/explorer/testdata/as/as_same_type.carbon index ed035c669abc..44be53061f50 100644 --- a/explorer/testdata/as/as_same_type.carbon +++ b/explorer/testdata/as/as_same_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 5 package ExplorerTest api; diff --git a/explorer/testdata/as/convert.carbon b/explorer/testdata/as/convert.carbon index 94fdd6c00873..56b964878c0f 100644 --- a/explorer/testdata/as/convert.carbon +++ b/explorer/testdata/as/convert.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 5 package ExplorerTest api; diff --git a/explorer/testdata/as/fail_destination_not_type.carbon b/explorer/testdata/as/fail_destination_not_type.carbon index 1869323a6bcc..24206abb498e 100644 --- a/explorer/testdata/as/fail_destination_not_type.carbon +++ b/explorer/testdata/as/fail_destination_not_type.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/as/fail_destination_not_type.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/as/fail_destination_not_type.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' return 4 as 7; } diff --git a/explorer/testdata/as/fail_intrinsic_convert_no_args.carbon b/explorer/testdata/as/fail_intrinsic_convert_no_args.carbon index a917a73a8b5e..063e8d99de2e 100644 --- a/explorer/testdata/as/fail_intrinsic_convert_no_args.carbon +++ b/explorer/testdata/as/fail_intrinsic_convert_no_args.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/as/fail_intrinsic_convert_no_args.carbon:[[@LINE+1]]: __intrinsic_implicit_as_convert takes 2 arguments + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/as/fail_intrinsic_convert_no_args.carbon:[[@LINE+1]]: __intrinsic_implicit_as_convert takes 2 arguments __intrinsic_implicit_as_convert(); return 0; } diff --git a/explorer/testdata/as/fail_intrinsic_convert_non_type.carbon b/explorer/testdata/as/fail_intrinsic_convert_non_type.carbon index 9d6bcb11125b..c5326db7b896 100644 --- a/explorer/testdata/as/fail_intrinsic_convert_non_type.carbon +++ b/explorer/testdata/as/fail_intrinsic_convert_non_type.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/as/fail_intrinsic_convert_non_type.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/as/fail_intrinsic_convert_non_type.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' __intrinsic_implicit_as_convert("example", 0); return 0; } diff --git a/explorer/testdata/as/fail_intrinsic_no_args.carbon b/explorer/testdata/as/fail_intrinsic_no_args.carbon index bd97d18729f4..9915a1c973a4 100644 --- a/explorer/testdata/as/fail_intrinsic_no_args.carbon +++ b/explorer/testdata/as/fail_intrinsic_no_args.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/as/fail_intrinsic_no_args.carbon:[[@LINE+1]]: __intrinsic_implicit_as takes 1 argument + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/as/fail_intrinsic_no_args.carbon:[[@LINE+1]]: __intrinsic_implicit_as takes 1 argument __intrinsic_implicit_as(); return 0; } diff --git a/explorer/testdata/as/fail_intrinsic_non_type.carbon b/explorer/testdata/as/fail_intrinsic_non_type.carbon index 53973f1a5ad1..c2dee671b2a5 100644 --- a/explorer/testdata/as/fail_intrinsic_non_type.carbon +++ b/explorer/testdata/as/fail_intrinsic_non_type.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/as/fail_intrinsic_non_type.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/as/fail_intrinsic_non_type.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' __intrinsic_implicit_as(0); return 0; } diff --git a/explorer/testdata/as/fail_no_conversion.carbon b/explorer/testdata/as/fail_no_conversion.carbon index 79ff74d8ad1d..70c5b22312ea 100644 --- a/explorer/testdata/as/fail_no_conversion.carbon +++ b/explorer/testdata/as/fail_no_conversion.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ class A { var n: i32; } fn Main() -> i32 { var a: A = {.n = 5}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/as/fail_no_conversion.carbon:[[@LINE+2]]: type error in `as`: `class A` is not explicitly convertible to `i32`: + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/as/fail_no_conversion.carbon:[[@LINE+2]]: type error in `as`: `class A` is not explicitly convertible to `i32`: // CHECK:STDERR: could not find implementation of interface As(T = i32) for class A return a as i32; } diff --git a/explorer/testdata/as/implicit_as.carbon b/explorer/testdata/as/implicit_as.carbon index e632d9d77ea8..bc11667ec264 100644 --- a/explorer/testdata/as/implicit_as.carbon +++ b/explorer/testdata/as/implicit_as.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 5 package ExplorerTest api; diff --git a/explorer/testdata/as/intrinsic_convert_non_value.carbon b/explorer/testdata/as/intrinsic_convert_non_value.carbon index e717cc36b145..90b5a2f4ff88 100644 --- a/explorer/testdata/as/intrinsic_convert_non_value.carbon +++ b/explorer/testdata/as/intrinsic_convert_non_value.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/as/struct_as_class.carbon b/explorer/testdata/as/struct_as_class.carbon index 2653ff70904d..aa1ffe4f7c45 100644 --- a/explorer/testdata/as/struct_as_class.carbon +++ b/explorer/testdata/as/struct_as_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 5 package ExplorerTest api; diff --git a/explorer/testdata/assert/assert.carbon b/explorer/testdata/assert/assert.carbon index 689eb46aa512..ac4b65305ada 100644 --- a/explorer/testdata/assert/assert.carbon +++ b/explorer/testdata/assert/assert.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/assert/convert.carbon b/explorer/testdata/assert/convert.carbon index c3a8458465e7..eb22f4789f41 100644 --- a/explorer/testdata/assert/convert.carbon +++ b/explorer/testdata/assert/convert.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/assert/fail_assert.carbon b/explorer/testdata/assert/fail_assert.carbon index 50976f902c6d..afcf17bafec4 100644 --- a/explorer/testdata/assert/fail_assert.carbon +++ b/explorer/testdata/assert/fail_assert.carbon @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} -// CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/data/prelude.carbon:{{.*}}: "HALLO WELT" +// CHECK:STDERR: RUNTIME ERROR: explorer/data/prelude.carbon:{{.*}}: "HALLO WELT" package ExplorerTest api; diff --git a/explorer/testdata/assert/fail_convert.carbon b/explorer/testdata/assert/fail_convert.carbon index 5ee3c88fa9ec..a6a42a32e42a 100644 --- a/explorer/testdata/assert/fail_convert.carbon +++ b/explorer/testdata/assert/fail_convert.carbon @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} -// CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/data/prelude.carbon:{{.*}}: "Fail" +// CHECK:STDERR: RUNTIME ERROR: explorer/data/prelude.carbon:{{.*}}: "Fail" package ExplorerTest api; diff --git a/explorer/testdata/assert/fail_intrinsic_bool_type.carbon b/explorer/testdata/assert/fail_intrinsic_bool_type.carbon index 0ec61ba97c34..d68d049f5203 100644 --- a/explorer/testdata/assert/fail_intrinsic_bool_type.carbon +++ b/explorer/testdata/assert/fail_intrinsic_bool_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -16,7 +14,7 @@ class ConvertTo(T:! type) { } fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/assert/fail_intrinsic_bool_type.carbon:[[@LINE+1]]: syntax error, unexpected COMMA + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/assert/fail_intrinsic_bool_type.carbon:[[@LINE+1]]: syntax error, unexpected COMMA __intrinsic_assert(, "unused"); return 0; } diff --git a/explorer/testdata/assert/fail_intrinsic_no_args.carbon b/explorer/testdata/assert/fail_intrinsic_no_args.carbon index c8a8b62a27c8..21723f21e6f7 100644 --- a/explorer/testdata/assert/fail_intrinsic_no_args.carbon +++ b/explorer/testdata/assert/fail_intrinsic_no_args.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -16,7 +14,7 @@ class ConvertTo(T:! type) { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assert/fail_intrinsic_no_args.carbon:[[@LINE+1]]: __intrinsic_assert takes 2 arguments + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assert/fail_intrinsic_no_args.carbon:[[@LINE+1]]: __intrinsic_assert takes 2 arguments __intrinsic_assert(); return 0; } diff --git a/explorer/testdata/assert/fail_intrinsic_no_convert.carbon b/explorer/testdata/assert/fail_intrinsic_no_convert.carbon index b089a5a15063..7a4cb87744d6 100644 --- a/explorer/testdata/assert/fail_intrinsic_no_convert.carbon +++ b/explorer/testdata/assert/fail_intrinsic_no_convert.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -16,7 +14,7 @@ class ConvertTo(T:! type) { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assert/fail_intrinsic_no_convert.carbon:[[@LINE+3]]: type error in __intrinsic_assert argument 0 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assert/fail_intrinsic_no_convert.carbon:[[@LINE+3]]: type error in __intrinsic_assert argument 0 // CHECK:STDERR: expected: bool // CHECK:STDERR: actual: class ConvertTo(T = bool) __intrinsic_assert({.v = true} as ConvertTo(bool), {.v = "Pass"} as ConvertTo(String)); diff --git a/explorer/testdata/assert/fail_intrinsic_str_type.carbon b/explorer/testdata/assert/fail_intrinsic_str_type.carbon index de012f444138..c7fe88f1e878 100644 --- a/explorer/testdata/assert/fail_intrinsic_str_type.carbon +++ b/explorer/testdata/assert/fail_intrinsic_str_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -16,7 +14,7 @@ class ConvertTo(T:! type) { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assert/fail_intrinsic_str_type.carbon:[[@LINE+3]]: type error in __intrinsic_assert argument 1 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assert/fail_intrinsic_str_type.carbon:[[@LINE+3]]: type error in __intrinsic_assert argument 1 // CHECK:STDERR: expected: String // CHECK:STDERR: actual: i32 __intrinsic_assert(true, 1); diff --git a/explorer/testdata/assign/convert_rhs.carbon b/explorer/testdata/assign/convert_rhs.carbon index 78e0f72d2788..303930528300 100644 --- a/explorer/testdata/assign/convert_rhs.carbon +++ b/explorer/testdata/assign/convert_rhs.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/assign/destruct_original.carbon b/explorer/testdata/assign/destruct_original.carbon index cfe6015c0452..93d0662f6bbb 100644 --- a/explorer/testdata/assign/destruct_original.carbon +++ b/explorer/testdata/assign/destruct_original.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/assign/reassign_original.carbon b/explorer/testdata/assign/reassign_original.carbon index 9afc8b5cd42f..4aecfba53275 100644 --- a/explorer/testdata/assign/reassign_original.carbon +++ b/explorer/testdata/assign/reassign_original.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/assoc_const/bug_multi_impl_scoping.carbon b/explorer/testdata/assoc_const/bug_multi_impl_scoping.carbon index 014795485c88..1748f28a08fb 100644 --- a/explorer/testdata/assoc_const/bug_multi_impl_scoping.carbon +++ b/explorer/testdata/assoc_const/bug_multi_impl_scoping.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: (C(i32) as A).FA() // CHECK:STDOUT: 6 // CHECK:STDOUT: (C(i32) as A).FA() diff --git a/explorer/testdata/assoc_const/fail_anonymous.carbon b/explorer/testdata/assoc_const/fail_anonymous.carbon index 4da898e2787e..4ec48e234459 100644 --- a/explorer/testdata/assoc_const/fail_anonymous.carbon +++ b/explorer/testdata/assoc_const/fail_anonymous.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface Iface { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/assoc_const/fail_anonymous.carbon:[[@LINE+1]]: syntax error, unexpected UNDERSCORE, expecting identifier or TEMPLATE + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/assoc_const/fail_anonymous.carbon:[[@LINE+1]]: syntax error, unexpected UNDERSCORE, expecting identifier or TEMPLATE let _:! type; } diff --git a/explorer/testdata/assoc_const/fail_different_type.carbon b/explorer/testdata/assoc_const/fail_different_type.carbon index 0b99e778745e..bcc23090863e 100644 --- a/explorer/testdata/assoc_const/fail_different_type.carbon +++ b/explorer/testdata/assoc_const/fail_different_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -21,7 +19,7 @@ external impl Bad as Iface where .T = Bad {} fn Main() -> i32 { F(Good); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_different_type.carbon:[[@LINE+1]]: constraint requires that (T).(Iface.T) (with value class Bad) == i32, which is not known to be true + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_different_type.carbon:[[@LINE+1]]: constraint requires that (T).(Iface.T) (with value class Bad) == i32, which is not known to be true F(Bad); return 0; } diff --git a/explorer/testdata/assoc_const/fail_different_value.carbon b/explorer/testdata/assoc_const/fail_different_value.carbon index f754ce5b4280..17b7cffa47b5 100644 --- a/explorer/testdata/assoc_const/fail_different_value.carbon +++ b/explorer/testdata/assoc_const/fail_different_value.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -21,7 +19,7 @@ external impl Bad as Iface where .N = 4 {} fn Main() -> i32 { F(Good); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_different_value.carbon:[[@LINE+1]]: constraint requires that (T).(Iface.N) (with value 4) == 5, which is not known to be true + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_different_value.carbon:[[@LINE+1]]: constraint requires that (T).(Iface.N) (with value 4) == 5, which is not known to be true F(Bad); return 0; } diff --git a/explorer/testdata/assoc_const/fail_equal_indirectly.carbon b/explorer/testdata/assoc_const/fail_equal_indirectly.carbon index 875875573c3c..1896f74e8e4a 100644 --- a/explorer/testdata/assoc_const/fail_equal_indirectly.carbon +++ b/explorer/testdata/assoc_const/fail_equal_indirectly.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -26,7 +24,7 @@ fn G[U:! type where .Self == i32, T:! Iface where .T = U](x: T, y: U) { // Not OK: would require looking through two levels of `==`. fn H[V:! type where .Self == i32, W:! Iface where .T == V](x: W, y: V) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_equal_indirectly.carbon:[[@LINE+1]]: constraint requires that (T).(Iface.T) (with value (W).(Iface.T)) == i32, which is not known to be true + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_equal_indirectly.carbon:[[@LINE+1]]: constraint requires that (T).(Iface.T) (with value (W).(Iface.T)) == i32, which is not known to be true F(x); } diff --git a/explorer/testdata/assoc_const/fail_equal_to_dependent_type.carbon b/explorer/testdata/assoc_const/fail_equal_to_dependent_type.carbon index 4e786c59e1e0..4503867ece72 100644 --- a/explorer/testdata/assoc_const/fail_equal_to_dependent_type.carbon +++ b/explorer/testdata/assoc_const/fail_equal_to_dependent_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,7 +17,7 @@ fn G[U:! Iface where .T == i32](x: U) { } fn H[V:! Iface](x: V) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_equal_to_dependent_type.carbon:[[@LINE+1]]: constraint requires that (T).(Iface.T) (with value (V).(Iface.T)) == i32, which is not known to be true + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_equal_to_dependent_type.carbon:[[@LINE+1]]: constraint requires that (T).(Iface.T) (with value (V).(Iface.T)) == i32, which is not known to be true F(x); } diff --git a/explorer/testdata/assoc_const/fail_implied_constraints.carbon b/explorer/testdata/assoc_const/fail_implied_constraints.carbon index ab0b9f6248c5..031badfcdc5f 100644 --- a/explorer/testdata/assoc_const/fail_implied_constraints.carbon +++ b/explorer/testdata/assoc_const/fail_implied_constraints.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -18,7 +16,7 @@ interface Z { // We reject this even though it is the responsibility of the `impl as Z` to // provide a type `N` such that `i32 is X(N)`. We might want to treat this as // an implied constraint and allow this in the future. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_implied_constraints.carbon:[[@LINE+1]]: could not find implementation of interface X(T = N) for i32 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_implied_constraints.carbon:[[@LINE+1]]: could not find implementation of interface X(T = N) for i32 let N:! Y(.Self) where .M = i32; } diff --git a/explorer/testdata/assoc_const/fail_incomplete_impl_1.carbon b/explorer/testdata/assoc_const/fail_incomplete_impl_1.carbon index d20748452f27..9928b2546fde 100644 --- a/explorer/testdata/assoc_const/fail_incomplete_impl_1.carbon +++ b/explorer/testdata/assoc_const/fail_incomplete_impl_1.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ interface HasThreeTypes { let C:! type; } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_incomplete_impl_1.carbon:[[@LINE+1]]: implementation doesn't provide a concrete value for interface HasThreeTypes.B +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_incomplete_impl_1.carbon:[[@LINE+1]]: implementation doesn't provide a concrete value for interface HasThreeTypes.B external impl i32 as HasThreeTypes where .A = i32 and .C = i32 {} fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/assoc_const/fail_incomplete_impl_2.carbon b/explorer/testdata/assoc_const/fail_incomplete_impl_2.carbon index eac37329cf40..adb1780439a7 100644 --- a/explorer/testdata/assoc_const/fail_incomplete_impl_2.carbon +++ b/explorer/testdata/assoc_const/fail_incomplete_impl_2.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ interface HasThreeTypes { let C:! type; } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_incomplete_impl_2.carbon:[[@LINE+1]]: implementation doesn't provide a concrete value for interface HasThreeTypes.C +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_incomplete_impl_2.carbon:[[@LINE+1]]: implementation doesn't provide a concrete value for interface HasThreeTypes.C external impl i32 as HasThreeTypes where .A = i32 and .B = .C {} fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/assoc_const/fail_indirectly_equal.carbon b/explorer/testdata/assoc_const/fail_indirectly_equal.carbon index 7e6a8206aff5..1f44b33edd4f 100644 --- a/explorer/testdata/assoc_const/fail_indirectly_equal.carbon +++ b/explorer/testdata/assoc_const/fail_indirectly_equal.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -23,7 +21,7 @@ fn F2[U:! A where .T == i32](x: i32) -> U.T { } fn F3[T:! A where .T == i32, U:! A where .T == i32](x: T.T) -> U.T { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_indirectly_equal.carbon:[[@LINE+1]]: type error in return value: '(T).(A.T)' is not implicitly convertible to '(U).(A.T)' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_indirectly_equal.carbon:[[@LINE+1]]: type error in return value: '(T).(A.T)' is not implicitly convertible to '(U).(A.T)' return x; } diff --git a/explorer/testdata/assoc_const/fail_match_in_deduction.carbon b/explorer/testdata/assoc_const/fail_match_in_deduction.carbon index eb89db97b09d..6a5b04a1bdb5 100644 --- a/explorer/testdata/assoc_const/fail_match_in_deduction.carbon +++ b/explorer/testdata/assoc_const/fail_match_in_deduction.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} // TODO: Should this work? @@ -22,7 +20,7 @@ fn F[Scalar:! type, V:! Vector where .Dim == 3](p: Point(Scalar, V.Dim), v: V) { fn G[Scalar:! type](p: Point(Scalar, 3)) {} fn H[V:! Vector where .Dim == 3](v: V) { var p: Point(i32, V.Dim) = {}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_match_in_deduction.carbon:[[@LINE+1]]: mismatch in non-deduced values, `(V).(Vector.Dim)` != `3` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_match_in_deduction.carbon:[[@LINE+1]]: mismatch in non-deduced values, `(V).(Vector.Dim)` != `3` G(p); } diff --git a/explorer/testdata/assoc_const/fail_missing_equal.carbon b/explorer/testdata/assoc_const/fail_missing_equal.carbon index 0744ee81b601..7bba99dd9e7e 100644 --- a/explorer/testdata/assoc_const/fail_missing_equal.carbon +++ b/explorer/testdata/assoc_const/fail_missing_equal.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -18,7 +16,7 @@ fn A[T:! Container where .Element == i32](x: T) -> T.Element { } fn B[T:! Container](x: T) -> T.Element { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_missing_equal.carbon:[[@LINE+1]]: constraint requires that (T).(Container.Element) (with value (T).(Container.Element)) == i32, which is not known to be true + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_missing_equal.carbon:[[@LINE+1]]: constraint requires that (T).(Container.Element) (with value (T).(Container.Element)) == i32, which is not known to be true return A(x); } diff --git a/explorer/testdata/assoc_const/fail_missing_rewrite.carbon b/explorer/testdata/assoc_const/fail_missing_rewrite.carbon index d7f054c44d21..3ee47c41edda 100644 --- a/explorer/testdata/assoc_const/fail_missing_rewrite.carbon +++ b/explorer/testdata/assoc_const/fail_missing_rewrite.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -18,7 +16,7 @@ fn A[T:! Container where .Element = i32](x: T) -> T.Element { } fn B[T:! Container](x: T) -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_missing_rewrite.carbon:[[@LINE+1]]: constraint requires that (T).(Container.Element) (with value (T).(Container.Element)) == i32, which is not known to be true + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_missing_rewrite.carbon:[[@LINE+1]]: constraint requires that (T).(Container.Element) (with value (T).(Container.Element)) == i32, which is not known to be true return A(x); } diff --git a/explorer/testdata/assoc_const/fail_multiple_deduction.carbon b/explorer/testdata/assoc_const/fail_multiple_deduction.carbon index 3884a23dfceb..5fc7f1d22f77 100644 --- a/explorer/testdata/assoc_const/fail_multiple_deduction.carbon +++ b/explorer/testdata/assoc_const/fail_multiple_deduction.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -16,7 +14,7 @@ interface HasThreeTypes { } fn F[T:! type](x: (T, T, T)); fn G[X:! HasThreeTypes where .A == .B and .B == .C and .C == .A](x: X) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_multiple_deduction.carbon:[[@LINE+3]]: deduced multiple different values for T:! type: + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_multiple_deduction.carbon:[[@LINE+3]]: deduced multiple different values for T:! type: // CHECK:STDERR: (X).(HasThreeTypes.A) // CHECK:STDERR: (X).(HasThreeTypes.B) F(x.Make()); diff --git a/explorer/testdata/assoc_const/fail_overspecified_impl.carbon b/explorer/testdata/assoc_const/fail_overspecified_impl.carbon index 823329535288..1454118927fc 100644 --- a/explorer/testdata/assoc_const/fail_overspecified_impl.carbon +++ b/explorer/testdata/assoc_const/fail_overspecified_impl.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ interface HasType { let T:! type; } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_overspecified_impl.carbon:[[@LINE+3]]: multiple different rewrites for `(i32).(HasType.T)`: +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_overspecified_impl.carbon:[[@LINE+3]]: multiple different rewrites for `(i32).(HasType.T)`: // CHECK:STDERR: i32 // CHECK:STDERR: {.a: i32} external impl i32 as HasType where .T = i32 and .T = {.a: i32} {} diff --git a/explorer/testdata/assoc_const/fail_redefined.carbon b/explorer/testdata/assoc_const/fail_redefined.carbon index 9874dddcdf85..2d9941febd55 100644 --- a/explorer/testdata/assoc_const/fail_redefined.carbon +++ b/explorer/testdata/assoc_const/fail_redefined.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface Iface { let T:! type; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_redefined.carbon:[[@LINE+1]]: Duplicate name `T` also found at {{.*}}/explorer/testdata/assoc_const/fail_redefined.carbon:[[@LINE-1]] + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_redefined.carbon:[[@LINE+1]]: Duplicate name `T` also found at explorer/testdata/assoc_const/fail_redefined.carbon:[[@LINE-1]] let T:! type; } diff --git a/explorer/testdata/assoc_const/fail_rewrite_creates_infinite_type.carbon b/explorer/testdata/assoc_const/fail_rewrite_creates_infinite_type.carbon index 54c22dc9b35b..87794f49dc92 100644 --- a/explorer/testdata/assoc_const/fail_rewrite_creates_infinite_type.carbon +++ b/explorer/testdata/assoc_const/fail_rewrite_creates_infinite_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ interface HasType { let T:! type; } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_rewrite_creates_infinite_type.carbon:[[@LINE+1]]: rewrite of (H).(HasType.T) applies within its own resolved expansion of (H).(HasType.T)* +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_rewrite_creates_infinite_type.carbon:[[@LINE+1]]: rewrite of (H).(HasType.T) applies within its own resolved expansion of (H).(HasType.T)* fn F[H:! HasType where .T = .T*]() {} fn Main() -> i32 { diff --git a/explorer/testdata/assoc_const/fail_rewrite_cycle.carbon b/explorer/testdata/assoc_const/fail_rewrite_cycle.carbon index 2b0f3ebdf7ec..500933f67a50 100644 --- a/explorer/testdata/assoc_const/fail_rewrite_cycle.carbon +++ b/explorer/testdata/assoc_const/fail_rewrite_cycle.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -32,7 +30,7 @@ fn F[ .T6 = .T7 and .T7 = .T8 and .T8 = .T9 and - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_rewrite_cycle.carbon:[[@LINE+1]]: rewrite of (M).(ManyTypes.T4) applies within its own resolved expansion of (M).(ManyTypes.T4) + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_rewrite_cycle.carbon:[[@LINE+1]]: rewrite of (M).(ManyTypes.T4) applies within its own resolved expansion of (M).(ManyTypes.T4) .T9 = .T0]() {} fn Main() -> i32 { diff --git a/explorer/testdata/assoc_const/fail_rewrite_depends_on_later_rewrite.carbon b/explorer/testdata/assoc_const/fail_rewrite_depends_on_later_rewrite.carbon index bcd10d7c0a03..6df685ed5daf 100644 --- a/explorer/testdata/assoc_const/fail_rewrite_depends_on_later_rewrite.carbon +++ b/explorer/testdata/assoc_const/fail_rewrite_depends_on_later_rewrite.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ interface HasTypeAndValue { let V:! T; } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_rewrite_depends_on_later_rewrite.carbon:[[@LINE+1]]: type error in rewrite constraint: 'i32' is not implicitly convertible to '(X).(HasTypeAndValue.T)' +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_rewrite_depends_on_later_rewrite.carbon:[[@LINE+1]]: type error in rewrite constraint: 'i32' is not implicitly convertible to '(X).(HasTypeAndValue.T)' fn F(X:! HasTypeAndValue where .V = 5 and .T = i32) -> i32 { return X.V; } impl i32 as HasTypeAndValue where .T = i32 and .V = 5 {} diff --git a/explorer/testdata/assoc_const/fail_simple_rewrite_cycle_1.carbon b/explorer/testdata/assoc_const/fail_simple_rewrite_cycle_1.carbon index 5583e1712de7..26507cd27075 100644 --- a/explorer/testdata/assoc_const/fail_simple_rewrite_cycle_1.carbon +++ b/explorer/testdata/assoc_const/fail_simple_rewrite_cycle_1.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,7 +13,7 @@ interface TwoTypes { // Attempting to fully resolve the replacement for `.T` would never create a // situation where `.T`'s expansion involves `.T`. Ensure we catch this anyway. -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_simple_rewrite_cycle_1.carbon:[[@LINE+1]]: rewrite of (X).(TwoTypes.U) applies within its own resolved expansion of (X).(TwoTypes.U)* +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_simple_rewrite_cycle_1.carbon:[[@LINE+1]]: rewrite of (X).(TwoTypes.U) applies within its own resolved expansion of (X).(TwoTypes.U)* fn F[X:! TwoTypes where .T = .U and .U = .U*]() {} fn Main() -> i32 { diff --git a/explorer/testdata/assoc_const/fail_simple_rewrite_cycle_2.carbon b/explorer/testdata/assoc_const/fail_simple_rewrite_cycle_2.carbon index 79734b2ea874..c718b2f7a56a 100644 --- a/explorer/testdata/assoc_const/fail_simple_rewrite_cycle_2.carbon +++ b/explorer/testdata/assoc_const/fail_simple_rewrite_cycle_2.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,7 +13,7 @@ interface TwoTypes { // Attempting to fully resolve the replacement for `.T` would never create a // situation where `.T`'s expansion involves `.T`. Ensure we catch this anyway. -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_simple_rewrite_cycle_2.carbon:[[@LINE+1]]: rewrite of (X).(TwoTypes.U) applies within its own resolved expansion of (X).(TwoTypes.U)* +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_simple_rewrite_cycle_2.carbon:[[@LINE+1]]: rewrite of (X).(TwoTypes.U) applies within its own resolved expansion of (X).(TwoTypes.U)* fn F[X:! TwoTypes where .U = .U* and .T = .U]() {} fn Main() -> i32 { diff --git a/explorer/testdata/assoc_const/fail_unknown_value.carbon b/explorer/testdata/assoc_const/fail_unknown_value.carbon index 7974c91200c4..b30d797062a4 100644 --- a/explorer/testdata/assoc_const/fail_unknown_value.carbon +++ b/explorer/testdata/assoc_const/fail_unknown_value.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ interface Iface { let N:! i32; } fn PickType(N: i32) -> type { return i32; } fn F[T:! Iface](x: T) -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_unknown_value.carbon:[[@LINE+1]]: value of associated constant (T).(Iface.N) is not known + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_unknown_value.carbon:[[@LINE+1]]: value of associated constant (T).(Iface.N) is not known var x: PickType(T.N) = 0; return x; } diff --git a/explorer/testdata/assoc_const/fail_unknown_value_specified_in_constraint.carbon b/explorer/testdata/assoc_const/fail_unknown_value_specified_in_constraint.carbon index 81576eaf2fce..1692055d6e78 100644 --- a/explorer/testdata/assoc_const/fail_unknown_value_specified_in_constraint.carbon +++ b/explorer/testdata/assoc_const/fail_unknown_value_specified_in_constraint.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ fn PickType(N: i32) -> type { return i32; } fn F[T:! Iface where .N == 5](x: T) -> i32 { // TODO: This should be valid: the value of T.N is known to be 5 here. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/assoc_const/fail_unknown_value_specified_in_constraint.carbon:[[@LINE+1]]: value of associated constant (T).(Iface.N) is not known + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/assoc_const/fail_unknown_value_specified_in_constraint.carbon:[[@LINE+1]]: value of associated constant (T).(Iface.N) is not known var x: PickType(T.N) = 0; return x; } diff --git a/explorer/testdata/assoc_const/impl_lookup.carbon b/explorer/testdata/assoc_const/impl_lookup.carbon index 163fad39b43c..dc23518f77a7 100644 --- a/explorer/testdata/assoc_const/impl_lookup.carbon +++ b/explorer/testdata/assoc_const/impl_lookup.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/assoc_const/impl_used_by_later_rewrite.carbon b/explorer/testdata/assoc_const/impl_used_by_later_rewrite.carbon index 2940e461ef48..545436a5286d 100644 --- a/explorer/testdata/assoc_const/impl_used_by_later_rewrite.carbon +++ b/explorer/testdata/assoc_const/impl_used_by_later_rewrite.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/assoc_const/implement.carbon b/explorer/testdata/assoc_const/implement.carbon index 8296830e2ad6..06aabc8eb6ea 100644 --- a/explorer/testdata/assoc_const/implement.carbon +++ b/explorer/testdata/assoc_const/implement.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 2 package ExplorerTest api; diff --git a/explorer/testdata/assoc_const/lookup_in_rewrite.carbon b/explorer/testdata/assoc_const/lookup_in_rewrite.carbon index b4675ded64a7..283e402773fc 100644 --- a/explorer/testdata/assoc_const/lookup_in_rewrite.carbon +++ b/explorer/testdata/assoc_const/lookup_in_rewrite.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 1 // CHECK:STDOUT: i32.Hash // CHECK:STDOUT: 0 diff --git a/explorer/testdata/assoc_const/member_of_value.carbon b/explorer/testdata/assoc_const/member_of_value.carbon index 2cb5488fa451..18730b39c511 100644 --- a/explorer/testdata/assoc_const/member_of_value.carbon +++ b/explorer/testdata/assoc_const/member_of_value.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 2 package ExplorerTest api; diff --git a/explorer/testdata/assoc_const/pass_equal_to_rewrite.carbon b/explorer/testdata/assoc_const/pass_equal_to_rewrite.carbon index 3b3dea527eb4..d51e02fe33e2 100644 --- a/explorer/testdata/assoc_const/pass_equal_to_rewrite.carbon +++ b/explorer/testdata/assoc_const/pass_equal_to_rewrite.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/assoc_const/pass_rewrite_to_equal.carbon b/explorer/testdata/assoc_const/pass_rewrite_to_equal.carbon index 42d612d1b306..f7d46dc6d9d1 100644 --- a/explorer/testdata/assoc_const/pass_rewrite_to_equal.carbon +++ b/explorer/testdata/assoc_const/pass_rewrite_to_equal.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/assoc_const/resolve_rewrites.carbon b/explorer/testdata/assoc_const/resolve_rewrites.carbon index 13fe404a5f78..3dfdacd031af 100644 --- a/explorer/testdata/assoc_const/resolve_rewrites.carbon +++ b/explorer/testdata/assoc_const/resolve_rewrites.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/assoc_const/rewrite_depends_on_prior_rewrite.carbon b/explorer/testdata/assoc_const/rewrite_depends_on_prior_rewrite.carbon index d6aeeb85a934..cdd99d0b86ed 100644 --- a/explorer/testdata/assoc_const/rewrite_depends_on_prior_rewrite.carbon +++ b/explorer/testdata/assoc_const/rewrite_depends_on_prior_rewrite.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 5 package ExplorerTest api; diff --git a/explorer/testdata/assoc_const/rewrite_interface_params.carbon b/explorer/testdata/assoc_const/rewrite_interface_params.carbon index 93ed6d579809..9f46c83fdc5a 100644 --- a/explorer/testdata/assoc_const/rewrite_interface_params.carbon +++ b/explorer/testdata/assoc_const/rewrite_interface_params.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/assoc_const/rewrite_large_type.carbon b/explorer/testdata/assoc_const/rewrite_large_type.carbon index 78bcf9ea38ec..65e968ec0bf6 100644 --- a/explorer/testdata/assoc_const/rewrite_large_type.carbon +++ b/explorer/testdata/assoc_const/rewrite_large_type.carbon @@ -3,8 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // This doesn't check trace output because it's too slow with it. -// NOAUTOUPDATE -// RUN: %{explorer-run} +// AUTOUPDATE // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/assoc_const/simple_constraint.carbon b/explorer/testdata/assoc_const/simple_constraint.carbon index bff930e48438..a00c432768b8 100644 --- a/explorer/testdata/assoc_const/simple_constraint.carbon +++ b/explorer/testdata/assoc_const/simple_constraint.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/assoc_const/simple_equality.carbon b/explorer/testdata/assoc_const/simple_equality.carbon index 8f2d583e9ab1..f64c4475aabf 100644 --- a/explorer/testdata/assoc_const/simple_equality.carbon +++ b/explorer/testdata/assoc_const/simple_equality.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/auto/fail_use_in_init.carbon b/explorer/testdata/auto/fail_use_in_init.carbon index b6049134a64e..21cd0e331219 100644 --- a/explorer/testdata/auto/fail_use_in_init.carbon +++ b/explorer/testdata/auto/fail_use_in_init.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { // TODO: The error here should be that we aren't allowed to refer to 'a' yet. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/auto/fail_use_in_init.carbon:[[@LINE+1]]: could not resolve 'a' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/auto/fail_use_in_init.carbon:[[@LINE+1]]: could not resolve 'a' var a: auto = a; return 0; } diff --git a/explorer/testdata/basic_syntax/addition.carbon b/explorer/testdata/basic_syntax/addition.carbon index 030c4c72461d..a596d0bfa48e 100644 --- a/explorer/testdata/basic_syntax/addition.carbon +++ b/explorer/testdata/basic_syntax/addition.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 7 package ExplorerTest api; diff --git a/explorer/testdata/basic_syntax/choice.carbon b/explorer/testdata/basic_syntax/choice.carbon index 0980dae66852..ee52aa3a9fe9 100644 --- a/explorer/testdata/basic_syntax/choice.carbon +++ b/explorer/testdata/basic_syntax/choice.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/basic_syntax/fail_alternative_not_type.carbon b/explorer/testdata/basic_syntax/fail_alternative_not_type.carbon index 2acc2ac9bdd3..b445f5221d42 100644 --- a/explorer/testdata/basic_syntax/fail_alternative_not_type.carbon +++ b/explorer/testdata/basic_syntax/fail_alternative_not_type.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_alternative_not_type.carbon:[[@LINE+1]]: type error in type expression: '(i32,)' is not implicitly convertible to 'type' +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/basic_syntax/fail_alternative_not_type.carbon:[[@LINE+1]]: type error in type expression: '(i32,)' is not implicitly convertible to 'type' choice C { X(42) } fn Main() -> i32 { diff --git a/explorer/testdata/basic_syntax/fail_alternative_uses_choice.carbon b/explorer/testdata/basic_syntax/fail_alternative_uses_choice.carbon index 233477526b45..e95eb99e523e 100644 --- a/explorer/testdata/basic_syntax/fail_alternative_uses_choice.carbon +++ b/explorer/testdata/basic_syntax/fail_alternative_uses_choice.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; choice Ch { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_alternative_uses_choice.carbon:[[@LINE+1]]: 'Ch' is not usable until after it has been completely declared + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/basic_syntax/fail_alternative_uses_choice.carbon:[[@LINE+1]]: 'Ch' is not usable until after it has been completely declared Opt(Ch) } diff --git a/explorer/testdata/basic_syntax/fail_assign_to_function.carbon b/explorer/testdata/basic_syntax/fail_assign_to_function.carbon index ec679637ed1b..1d6829d69197 100644 --- a/explorer/testdata/basic_syntax/fail_assign_to_function.carbon +++ b/explorer/testdata/basic_syntax/fail_assign_to_function.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ fn F() {} fn G() {} fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_assign_to_function.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `F` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/basic_syntax/fail_assign_to_function.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `F` F = G; return 0; } diff --git a/explorer/testdata/basic_syntax/fail_assign_to_rval.carbon b/explorer/testdata/basic_syntax/fail_assign_to_rval.carbon index 45b8ae716e09..2cc5f10b94c9 100644 --- a/explorer/testdata/basic_syntax/fail_assign_to_rval.carbon +++ b/explorer/testdata/basic_syntax/fail_assign_to_rval.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_assign_to_rval.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `1` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/basic_syntax/fail_assign_to_rval.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `1` 1 = 0; return 0; } diff --git a/explorer/testdata/basic_syntax/fail_block.carbon b/explorer/testdata/basic_syntax/fail_block.carbon index 689889a969b0..2099fbf6cdb1 100644 --- a/explorer/testdata/basic_syntax/fail_block.carbon +++ b/explorer/testdata/basic_syntax/fail_block.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_block.carbon:[[@LINE+1]]: syntax error, unexpected RETURN, expecting PERIOD or RIGHT_CURLY_BRACE + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/basic_syntax/fail_block.carbon:[[@LINE+1]]: syntax error, unexpected RETURN, expecting PERIOD or RIGHT_CURLY_BRACE return 0; } } diff --git a/explorer/testdata/basic_syntax/fail_choice_extra_parens.carbon b/explorer/testdata/basic_syntax/fail_choice_extra_parens.carbon index bd9db3f314d7..5821b6a7e834 100644 --- a/explorer/testdata/basic_syntax/fail_choice_extra_parens.carbon +++ b/explorer/testdata/basic_syntax/fail_choice_extra_parens.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,7 +13,7 @@ choice Ints { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_choice_extra_parens.carbon:[[@LINE+1]]: alternative `choice Ints.None` does not expect an argument list + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/basic_syntax/fail_choice_extra_parens.carbon:[[@LINE+1]]: alternative `choice Ints.None` does not expect an argument list match (Ints.None()) { case Ints.None => { return 0; } default => { return 1; } diff --git a/explorer/testdata/basic_syntax/fail_choice_no_parens.carbon b/explorer/testdata/basic_syntax/fail_choice_no_parens.carbon index 7ab87b3b684e..6c41b507b726 100644 --- a/explorer/testdata/basic_syntax/fail_choice_no_parens.carbon +++ b/explorer/testdata/basic_syntax/fail_choice_no_parens.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -17,7 +15,7 @@ choice Ints { fn Main() -> i32 { match (Ints.None) { case Ints.None() => { return 0; } - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_choice_no_parens.carbon:[[@LINE+3]]: type error in `match` pattern type + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/basic_syntax/fail_choice_no_parens.carbon:[[@LINE+3]]: type error in `match` pattern type // CHECK:STDERR: expected: choice Ints // CHECK:STDERR: actual: fn () -> choice Ints default => { return 1; } diff --git a/explorer/testdata/basic_syntax/fail_choice_pattern_extra_parens.carbon b/explorer/testdata/basic_syntax/fail_choice_pattern_extra_parens.carbon index 998a9df3423e..89961699a38e 100644 --- a/explorer/testdata/basic_syntax/fail_choice_pattern_extra_parens.carbon +++ b/explorer/testdata/basic_syntax/fail_choice_pattern_extra_parens.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -16,7 +14,7 @@ choice Ints { fn Main() -> i32 { match (Ints.None) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_choice_pattern_extra_parens.carbon:[[@LINE+1]]: alternative `choice Ints.None` does not expect an argument list + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/basic_syntax/fail_choice_pattern_extra_parens.carbon:[[@LINE+1]]: alternative `choice Ints.None` does not expect an argument list case Ints.None() => { return 0; } default => { return 1; } } diff --git a/explorer/testdata/basic_syntax/fail_choice_pattern_no_parens.carbon b/explorer/testdata/basic_syntax/fail_choice_pattern_no_parens.carbon index ac5d0339595a..5de8807b1d42 100644 --- a/explorer/testdata/basic_syntax/fail_choice_pattern_no_parens.carbon +++ b/explorer/testdata/basic_syntax/fail_choice_pattern_no_parens.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -17,7 +15,7 @@ choice Ints { fn Main() -> i32 { match (Ints.None()) { case Ints.None => { return 0; } - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_choice_pattern_no_parens.carbon:[[@LINE+3]]: type error in `match` pattern type + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/basic_syntax/fail_choice_pattern_no_parens.carbon:[[@LINE+3]]: type error in `match` pattern type // CHECK:STDERR: expected: fn () -> choice Ints // CHECK:STDERR: actual: choice Ints default => { return 1; } diff --git a/explorer/testdata/basic_syntax/fail_compare_precedence.carbon b/explorer/testdata/basic_syntax/fail_compare_precedence.carbon index a4b48cd8964e..3d39157c63f5 100644 --- a/explorer/testdata/basic_syntax/fail_compare_precedence.carbon +++ b/explorer/testdata/basic_syntax/fail_compare_precedence.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn CompareBools(a: bool, b: bool) -> bool { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_compare_precedence.carbon:[[@LINE+1]]: syntax error, unexpected EQUAL_EQUAL, expecting SEMICOLON + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/basic_syntax/fail_compare_precedence.carbon:[[@LINE+1]]: syntax error, unexpected EQUAL_EQUAL, expecting SEMICOLON return not a == b; } diff --git a/explorer/testdata/basic_syntax/fail_invalid_char.carbon b/explorer/testdata/basic_syntax/fail_invalid_char.carbon index bcd9f7b75af4..702671d2c056 100644 --- a/explorer/testdata/basic_syntax/fail_invalid_char.carbon +++ b/explorer/testdata/basic_syntax/fail_invalid_char.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} -// CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_invalid_char.carbon:[[@LINE+1]]: invalid character '\xEF' in source file. +// CHECK:STDERR: SYNTAX ERROR: explorer/testdata/basic_syntax/fail_invalid_char.carbon:[[@LINE+1]]: invalid character '\xEF' in source file. � diff --git a/explorer/testdata/basic_syntax/fail_invalid_integer.carbon b/explorer/testdata/basic_syntax/fail_invalid_integer.carbon index e5ff654954a9..413481d7fe72 100644 --- a/explorer/testdata/basic_syntax/fail_invalid_integer.carbon +++ b/explorer/testdata/basic_syntax/fail_invalid_integer.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_invalid_integer.carbon:[[@LINE+1]]: Invalid integer literal: 11111111111111111111111111 + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/basic_syntax/fail_invalid_integer.carbon:[[@LINE+1]]: Invalid integer literal: 11111111111111111111111111 return 11111111111111111111111111; } diff --git a/explorer/testdata/basic_syntax/fail_invalid_integer_type.carbon b/explorer/testdata/basic_syntax/fail_invalid_integer_type.carbon index 058266af004e..45959f3d0126 100644 --- a/explorer/testdata/basic_syntax/fail_invalid_integer_type.carbon +++ b/explorer/testdata/basic_syntax/fail_invalid_integer_type.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_invalid_integer_type.carbon:[[@LINE+1]]: Invalid type literal: i11111111111111111111111111 + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/basic_syntax/fail_invalid_integer_type.carbon:[[@LINE+1]]: Invalid type literal: i11111111111111111111111111 var x: i11111111111111111111111111 = 1; return 0; } diff --git a/explorer/testdata/basic_syntax/fail_unimplemented_example.carbon b/explorer/testdata/basic_syntax/fail_unimplemented_example.carbon index 5b9624c0bfc9..8d06ff961126 100644 --- a/explorer/testdata/basic_syntax/fail_unimplemented_example.carbon +++ b/explorer/testdata/basic_syntax/fail_unimplemented_example.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_unimplemented_example.carbon:[[@LINE+1]]: Unimplemented + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/basic_syntax/fail_unimplemented_example.carbon:[[@LINE+1]]: Unimplemented return 1 __unimplemented_example_infix 2; } diff --git a/explorer/testdata/basic_syntax/fail_unknown_intrinsic.carbon b/explorer/testdata/basic_syntax/fail_unknown_intrinsic.carbon index bbfdf41878c5..f5411e7cab6d 100644 --- a/explorer/testdata/basic_syntax/fail_unknown_intrinsic.carbon +++ b/explorer/testdata/basic_syntax/fail_unknown_intrinsic.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_unknown_intrinsic.carbon:[[@LINE+1]]: Unknown intrinsic 'nonexistent' + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/basic_syntax/fail_unknown_intrinsic.carbon:[[@LINE+1]]: Unknown intrinsic 'nonexistent' return __intrinsic_nonexistent(); } diff --git a/explorer/testdata/basic_syntax/fail_unsupported_integer_type.carbon b/explorer/testdata/basic_syntax/fail_unsupported_integer_type.carbon index 79ef4eace642..b53d17a7452b 100644 --- a/explorer/testdata/basic_syntax/fail_unsupported_integer_type.carbon +++ b/explorer/testdata/basic_syntax/fail_unsupported_integer_type.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_unsupported_integer_type.carbon:[[@LINE+1]]: Only i32 is supported for now: i64 + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/basic_syntax/fail_unsupported_integer_type.carbon:[[@LINE+1]]: Only i32 is supported for now: i64 var x: i64 = 1; return 0; } diff --git a/explorer/testdata/basic_syntax/record.carbon b/explorer/testdata/basic_syntax/record.carbon index 357138dbfea4..2b53199da4f2 100644 --- a/explorer/testdata/basic_syntax/record.carbon +++ b/explorer/testdata/basic_syntax/record.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/basic_syntax/star.carbon b/explorer/testdata/basic_syntax/star.carbon index af0b8e19462f..b32bc9fdb268 100644 --- a/explorer/testdata/basic_syntax/star.carbon +++ b/explorer/testdata/basic_syntax/star.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/block/empty.carbon b/explorer/testdata/block/empty.carbon index d18cd280ca1f..78a52935a83d 100644 --- a/explorer/testdata/block/empty.carbon +++ b/explorer/testdata/block/empty.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/block/shadowing.carbon b/explorer/testdata/block/shadowing.carbon index a860cd0fbde2..6e7978ac3af6 100644 --- a/explorer/testdata/block/shadowing.carbon +++ b/explorer/testdata/block/shadowing.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/choice/fail_recursive_use.carbon b/explorer/testdata/choice/fail_recursive_use.carbon index 94799f0e8963..0fc34199f04d 100644 --- a/explorer/testdata/choice/fail_recursive_use.carbon +++ b/explorer/testdata/choice/fail_recursive_use.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; choice C { X, - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/choice/fail_recursive_use.carbon:[[@LINE+1]]: 'C' is not usable until after it has been completely declared + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/choice/fail_recursive_use.carbon:[[@LINE+1]]: 'C' is not usable until after it has been completely declared Y(if C.X then i32 else i32) } diff --git a/explorer/testdata/choice/generic_choice_multiple_template_arguments.carbon b/explorer/testdata/choice/generic_choice_multiple_template_arguments.carbon index 01c6874f3838..64d2b192ceb6 100644 --- a/explorer/testdata/choice/generic_choice_multiple_template_arguments.carbon +++ b/explorer/testdata/choice/generic_choice_multiple_template_arguments.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 22 package ExplorerTest api; diff --git a/explorer/testdata/choice/generic_choice_nested_in_template_class.carbon b/explorer/testdata/choice/generic_choice_nested_in_template_class.carbon index b2c58eb1897a..d52d6c054129 100644 --- a/explorer/testdata/choice/generic_choice_nested_in_template_class.carbon +++ b/explorer/testdata/choice/generic_choice_nested_in_template_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: H 22 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/choice/generic_choice_simple_assignment.carbon b/explorer/testdata/choice/generic_choice_simple_assignment.carbon index 04a64ad1d996..259fe72f2deb 100644 --- a/explorer/testdata/choice/generic_choice_simple_assignment.carbon +++ b/explorer/testdata/choice/generic_choice_simple_assignment.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 22 package ExplorerTest api; diff --git a/explorer/testdata/choice/mixed_arity.carbon b/explorer/testdata/choice/mixed_arity.carbon index 6127df6e26c6..9b902358dbc9 100644 --- a/explorer/testdata/choice/mixed_arity.carbon +++ b/explorer/testdata/choice/mixed_arity.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 25 package ExplorerTest api; diff --git a/explorer/testdata/choice/type_of_type.carbon b/explorer/testdata/choice/type_of_type.carbon index beba53d09232..1fe46a3b40ef 100644 --- a/explorer/testdata/choice/type_of_type.carbon +++ b/explorer/testdata/choice/type_of_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/abstract_class.carbon b/explorer/testdata/class/abstract_class.carbon index a9e9715fedcd..08dbb93df81f 100644 --- a/explorer/testdata/class/abstract_class.carbon +++ b/explorer/testdata/class/abstract_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: d.a=1 // CHECK:STDOUT: d.b=2 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/class/assign.carbon b/explorer/testdata/class/assign.carbon index 4e0c805e3dfa..060f7bffe214 100644 --- a/explorer/testdata/class/assign.carbon +++ b/explorer/testdata/class/assign.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/assign_member.carbon b/explorer/testdata/class/assign_member.carbon index d76c76d9b8ce..1ebf69c056d6 100644 --- a/explorer/testdata/class/assign_member.carbon +++ b/explorer/testdata/class/assign_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/base_constructor.carbon b/explorer/testdata/class/base_constructor.carbon index 66dcfc6ac747..fec9601abf06 100644 --- a/explorer/testdata/class/base_constructor.carbon +++ b/explorer/testdata/class/base_constructor.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 1 // CHECK:STDOUT: 2 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/class/bound_method.carbon b/explorer/testdata/class/bound_method.carbon index c4276aad32dc..d43ef6ca66eb 100644 --- a/explorer/testdata/class/bound_method.carbon +++ b/explorer/testdata/class/bound_method.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/class_function.carbon b/explorer/testdata/class/class_function.carbon index ac663535794a..75fbf9f76f57 100644 --- a/explorer/testdata/class/class_function.carbon +++ b/explorer/testdata/class/class_function.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/class_function_from_instance.carbon b/explorer/testdata/class/class_function_from_instance.carbon index 09f061194212..955e63350abd 100644 --- a/explorer/testdata/class/class_function_from_instance.carbon +++ b/explorer/testdata/class/class_function_from_instance.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/class_function_self.carbon b/explorer/testdata/class/class_function_self.carbon index 0dbf1619badb..8daf4715bb32 100644 --- a/explorer/testdata/class/class_function_self.carbon +++ b/explorer/testdata/class/class_function_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/class_function_value.carbon b/explorer/testdata/class/class_function_value.carbon index 8017af0c54b5..657add87fbf8 100644 --- a/explorer/testdata/class/class_function_value.carbon +++ b/explorer/testdata/class/class_function_value.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/class_inheritance_function_call.carbon b/explorer/testdata/class/class_inheritance_function_call.carbon index 54693ecbd9eb..2ff05f69f707 100644 --- a/explorer/testdata/class/class_inheritance_function_call.carbon +++ b/explorer/testdata/class/class_inheritance_function_call.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Class C, call 0 // CHECK:STDOUT: Class D, call 0 // CHECK:STDOUT: Class C, call 1 diff --git a/explorer/testdata/class/class_inheritance_methods.carbon b/explorer/testdata/class/class_inheritance_methods.carbon index 766d96acad39..9eaa895cdafc 100644 --- a/explorer/testdata/class/class_inheritance_methods.carbon +++ b/explorer/testdata/class/class_inheritance_methods.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Class 1 // CHECK:STDOUT: Class 2 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/class/class_inheritance_multiple.carbon b/explorer/testdata/class/class_inheritance_multiple.carbon index a96ec3a9f9aa..6f994c9f6a3f 100644 --- a/explorer/testdata/class/class_inheritance_multiple.carbon +++ b/explorer/testdata/class/class_inheritance_multiple.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: A // CHECK:STDOUT: c.a: 1 // CHECK:STDOUT: c.b: 2 diff --git a/explorer/testdata/class/class_inheritance_shadow.carbon b/explorer/testdata/class/class_inheritance_shadow.carbon index e352fd1e99d4..d8934c38058c 100644 --- a/explorer/testdata/class/class_inheritance_shadow.carbon +++ b/explorer/testdata/class/class_inheritance_shadow.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Class D // CHECK:STDOUT: d.value = 2 // CHECK:STDOUT: d.GetValue() = 2 diff --git a/explorer/testdata/class/class_inheritance_variables.carbon b/explorer/testdata/class/class_inheritance_variables.carbon index 710c7cf6ed53..d742639f1ac8 100644 --- a/explorer/testdata/class/class_inheritance_variables.carbon +++ b/explorer/testdata/class/class_inheritance_variables.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Read var_c=1 // CHECK:STDOUT: Read var_d=2 // CHECK:STDOUT: Assign var_c=3 diff --git a/explorer/testdata/class/class_subtyping_argument.carbon b/explorer/testdata/class/class_subtyping_argument.carbon index d4ff082c7b5d..799df00957aa 100644 --- a/explorer/testdata/class/class_subtyping_argument.carbon +++ b/explorer/testdata/class/class_subtyping_argument.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Foo(c1): 1 // CHECK:STDOUT: Foo(c2): 1 // CHECK:STDOUT: Foo(d): 1 diff --git a/explorer/testdata/class/class_subtyping_basic.carbon b/explorer/testdata/class/class_subtyping_basic.carbon index dde7b8fdc4a7..3b0abcde1d6f 100644 --- a/explorer/testdata/class/class_subtyping_basic.carbon +++ b/explorer/testdata/class/class_subtyping_basic.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: (*c).a: 1 // CHECK:STDOUT: Foo(&d): 1 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/class/class_subtyping_multiple.carbon b/explorer/testdata/class/class_subtyping_multiple.carbon index e51e42d108f3..1d35fbfbd89d 100644 --- a/explorer/testdata/class/class_subtyping_multiple.carbon +++ b/explorer/testdata/class/class_subtyping_multiple.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: (*c1).val: 1 // CHECK:STDOUT: (*c2).val: 1 // CHECK:STDOUT: (*d).val: 2 diff --git a/explorer/testdata/class/empty_class.carbon b/explorer/testdata/class/empty_class.carbon index c7e82dd7a5c3..1c4bb0c8d77f 100644 --- a/explorer/testdata/class/empty_class.carbon +++ b/explorer/testdata/class/empty_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/fail_abstract_method_not_supported.carbon b/explorer/testdata/class/fail_abstract_method_not_supported.carbon index 9ba1d62fe908..70885ec0587f 100644 --- a/explorer/testdata/class/fail_abstract_method_not_supported.carbon +++ b/explorer/testdata/class/fail_abstract_method_not_supported.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ base class C { class D extends C { abstract fn Foo[self:Self]() -> i32 { return 1; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_abstract_method_not_supported.carbon:[[@LINE+1]]: Error declaring `Foo`: `abstract` methods are not yet supported. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_abstract_method_not_supported.carbon:[[@LINE+1]]: Error declaring `Foo`: `abstract` methods are not yet supported. } } diff --git a/explorer/testdata/class/fail_call_method_before_typecheck.carbon b/explorer/testdata/class/fail_call_method_before_typecheck.carbon index 2d19c9bf7b98..332c258ae96f 100644 --- a/explorer/testdata/class/fail_call_method_before_typecheck.carbon +++ b/explorer/testdata/class/fail_call_method_before_typecheck.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class A { fn F[self: Self]() -> type { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_call_method_before_typecheck.carbon:[[@LINE+1]]: attempt to call function `F` that has not been fully type-checked + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_call_method_before_typecheck.carbon:[[@LINE+1]]: attempt to call function `F` that has not been fully type-checked var a: ({} as A).F() = 0; return i32; } diff --git a/explorer/testdata/class/fail_call_undefined_method.carbon b/explorer/testdata/class/fail_call_undefined_method.carbon index ae421bd96217..b9b1dc7efa0c 100644 --- a/explorer/testdata/class/fail_call_undefined_method.carbon +++ b/explorer/testdata/class/fail_call_undefined_method.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,6 +12,6 @@ class A { fn Main() -> i32 { var a: A = {}; - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/class/fail_call_undefined_method.carbon:[[@LINE+1]]: attempt to call function `F` that has not been defined + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/class/fail_call_undefined_method.carbon:[[@LINE+1]]: attempt to call function `F` that has not been defined return a.F(); } diff --git a/explorer/testdata/class/fail_class_named_self.carbon b/explorer/testdata/class/fail_class_named_self.carbon index e7f5609cee90..11374be25ab6 100644 --- a/explorer/testdata/class/fail_class_named_self.carbon +++ b/explorer/testdata/class/fail_class_named_self.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; // Error: Can't use keyword `Self` as the name of a class. -// CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/class/fail_class_named_self.carbon:[[@LINE+1]]: syntax error, unexpected SELF, expecting identifier or LEFT_PARENTHESIS +// CHECK:STDERR: SYNTAX ERROR: explorer/testdata/class/fail_class_named_self.carbon:[[@LINE+1]]: syntax error, unexpected SELF, expecting identifier or LEFT_PARENTHESIS class Self { var x: i32; var y: i32; diff --git a/explorer/testdata/class/fail_direct_base_class_init.carbon b/explorer/testdata/class/fail_direct_base_class_init.carbon index 8f79d6b30d43..9395399545cf 100644 --- a/explorer/testdata/class/fail_direct_base_class_init.carbon +++ b/explorer/testdata/class/fail_direct_base_class_init.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -17,7 +15,7 @@ class B extends A { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_direct_base_class_init.carbon:[[@LINE+1]]: type error in initializer of variable: '{.a: i32, .b: i32}' is not implicitly convertible to 'class B' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_direct_base_class_init.carbon:[[@LINE+1]]: type error in initializer of variable: '{.a: i32, .b: i32}' is not implicitly convertible to 'class B' var b: B = {.a=0, .b=1}; return 0; } diff --git a/explorer/testdata/class/fail_extends_final_class.carbon b/explorer/testdata/class/fail_extends_final_class.carbon index 3ffdd137c5b4..279c10b9c8a4 100644 --- a/explorer/testdata/class/fail_extends_final_class.carbon +++ b/explorer/testdata/class/fail_extends_final_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ class C { class D extends C { fn G() {} -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_extends_final_class.carbon:[[@LINE+1]]: Base class `C` is `final` and cannot be inherited. Add the `base` or `abstract` class prefix to `C` to allow it to be inherited +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_extends_final_class.carbon:[[@LINE+1]]: Base class `C` is `final` and cannot be inherited. Add the `base` or `abstract` class prefix to `C` to allow it to be inherited } fn Main() -> i32 { diff --git a/explorer/testdata/class/fail_extends_non_class.carbon b/explorer/testdata/class/fail_extends_non_class.carbon index d5c7ff0b1dad..99a7ade869d0 100644 --- a/explorer/testdata/class/fail_extends_non_class.carbon +++ b/explorer/testdata/class/fail_extends_non_class.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_extends_non_class.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_extends_non_class.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' class C extends 3 { var x: i32; var y: i32; diff --git a/explorer/testdata/class/fail_field_access_mismatch.carbon b/explorer/testdata/class/fail_field_access_mismatch.carbon index 1e9e00b126c4..0d356e6d1a68 100644 --- a/explorer/testdata/class/fail_field_access_mismatch.carbon +++ b/explorer/testdata/class/fail_field_access_mismatch.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,6 +13,6 @@ class Point { fn Main() -> i32 { var p: Point = {.x = 1, .y = 2}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_field_access_mismatch.carbon:[[@LINE+1]]: class Point does not have a field named z + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_field_access_mismatch.carbon:[[@LINE+1]]: class Point does not have a field named z return p.z - 1; } diff --git a/explorer/testdata/class/fail_field_access_mismatch_base.carbon b/explorer/testdata/class/fail_field_access_mismatch_base.carbon index 9b8ff25d52a3..179c28274d05 100644 --- a/explorer/testdata/class/fail_field_access_mismatch_base.carbon +++ b/explorer/testdata/class/fail_field_access_mismatch_base.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,6 +17,6 @@ class Point3D extends Point { fn Main() -> i32 { var p: Point3D = {.base={.x = 1, .y = 2}, .z = 3}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_field_access_mismatch_base.carbon:[[@LINE+1]]: class Point3D does not have a field named a + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_field_access_mismatch_base.carbon:[[@LINE+1]]: class Point3D does not have a field named a return p.a; } diff --git a/explorer/testdata/class/fail_field_assign_mismatch_base.carbon b/explorer/testdata/class/fail_field_assign_mismatch_base.carbon index 67b8db49e03c..69886f0b9e0a 100644 --- a/explorer/testdata/class/fail_field_assign_mismatch_base.carbon +++ b/explorer/testdata/class/fail_field_assign_mismatch_base.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,7 +17,7 @@ class Point3D extends Point { fn Main() -> i32 { var p: Point3D = {.base={.x = 1, .y = 2}, .z = 3}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_field_assign_mismatch_base.carbon:[[@LINE+1]]: class Point3D does not have a field named a + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_field_assign_mismatch_base.carbon:[[@LINE+1]]: class Point3D does not have a field named a p.a = 0; return 0; } diff --git a/explorer/testdata/class/fail_field_mismatch.carbon b/explorer/testdata/class/fail_field_mismatch.carbon index afd6ab26ae99..073186074772 100644 --- a/explorer/testdata/class/fail_field_mismatch.carbon +++ b/explorer/testdata/class/fail_field_mismatch.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ class Point { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_field_mismatch.carbon:[[@LINE+1]]: type error in initializer of variable: '{.x: i32, .z: i32}' is not implicitly convertible to 'class Point' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_field_mismatch.carbon:[[@LINE+1]]: type error in initializer of variable: '{.x: i32, .z: i32}' is not implicitly convertible to 'class Point' var p: Point = {.x = 1, .z = 2}; return p.x - 1; } diff --git a/explorer/testdata/class/fail_field_missing.carbon b/explorer/testdata/class/fail_field_missing.carbon index b0e4e8c06246..0438ada5f825 100644 --- a/explorer/testdata/class/fail_field_missing.carbon +++ b/explorer/testdata/class/fail_field_missing.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ class Point { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_field_missing.carbon:[[@LINE+1]]: type error in initializer of variable: '{.x: i32}' is not implicitly convertible to 'class Point' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_field_missing.carbon:[[@LINE+1]]: type error in initializer of variable: '{.x: i32}' is not implicitly convertible to 'class Point' var p: Point = {.x = 1}; return p.x - 1; } diff --git a/explorer/testdata/class/fail_impl_method_not_existing.carbon b/explorer/testdata/class/fail_impl_method_not_existing.carbon index 305abe8c6dbe..4dce79018ec2 100644 --- a/explorer/testdata/class/fail_impl_method_not_existing.carbon +++ b/explorer/testdata/class/fail_impl_method_not_existing.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ base class C { class D extends C { impl fn Foo[self:Self]() -> i32 { return 1; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_impl_method_not_existing.carbon:[[@LINE+1]]: Error declaring `Foo`: cannot override a method that is not declared `abstract` or `virtual` in base class. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_impl_method_not_existing.carbon:[[@LINE+1]]: Error declaring `Foo`: cannot override a method that is not declared `abstract` or `virtual` in base class. } } diff --git a/explorer/testdata/class/fail_impl_method_not_virtual.carbon b/explorer/testdata/class/fail_impl_method_not_virtual.carbon index 48380261f3ee..5ccc09a71ebf 100644 --- a/explorer/testdata/class/fail_impl_method_not_virtual.carbon +++ b/explorer/testdata/class/fail_impl_method_not_virtual.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -17,7 +15,7 @@ base class C { class D extends C { impl fn Foo[self:Self]() -> i32 { return 1; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_impl_method_not_virtual.carbon:[[@LINE+1]]: Error declaring `Foo`: cannot override a method that is not declared `abstract` or `virtual` in base class. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_impl_method_not_virtual.carbon:[[@LINE+1]]: Error declaring `Foo`: cannot override a method that is not declared `abstract` or `virtual` in base class. } } diff --git a/explorer/testdata/class/fail_instantiate_abstract_class_constructor.carbon b/explorer/testdata/class/fail_instantiate_abstract_class_constructor.carbon index 6764d5fdaf16..55e910b6d0eb 100644 --- a/explorer/testdata/class/fail_instantiate_abstract_class_constructor.carbon +++ b/explorer/testdata/class/fail_instantiate_abstract_class_constructor.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -17,7 +15,7 @@ abstract class C { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_instantiate_abstract_class_constructor.carbon:[[@LINE+1]]: Cannot instantiate abstract class C + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_instantiate_abstract_class_constructor.carbon:[[@LINE+1]]: Cannot instantiate abstract class C var c: C = C.Create(); return 0; } diff --git a/explorer/testdata/class/fail_instantiate_abstract_class_empty.carbon b/explorer/testdata/class/fail_instantiate_abstract_class_empty.carbon index 7da3b3561ef4..c461ebc1556f 100644 --- a/explorer/testdata/class/fail_instantiate_abstract_class_empty.carbon +++ b/explorer/testdata/class/fail_instantiate_abstract_class_empty.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ abstract class C { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_instantiate_abstract_class_empty.carbon:[[@LINE+1]]: Cannot instantiate abstract class C + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_instantiate_abstract_class_empty.carbon:[[@LINE+1]]: Cannot instantiate abstract class C var c: C; return 0; } diff --git a/explorer/testdata/class/fail_instantiate_abstract_class_struct.carbon b/explorer/testdata/class/fail_instantiate_abstract_class_struct.carbon index 810018e772d4..489255ebbd0d 100644 --- a/explorer/testdata/class/fail_instantiate_abstract_class_struct.carbon +++ b/explorer/testdata/class/fail_instantiate_abstract_class_struct.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ abstract class C { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_instantiate_abstract_class_struct.carbon:[[@LINE+1]]: Cannot instantiate abstract class C + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_instantiate_abstract_class_struct.carbon:[[@LINE+1]]: Cannot instantiate abstract class C var c: C = { .a = 1 }; return 0; } diff --git a/explorer/testdata/class/fail_invalid_subtyping.carbon b/explorer/testdata/class/fail_invalid_subtyping.carbon index 7f86ce80d5e8..f5e8a0bd4c55 100644 --- a/explorer/testdata/class/fail_invalid_subtyping.carbon +++ b/explorer/testdata/class/fail_invalid_subtyping.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -16,7 +14,7 @@ class D { fn Main() -> i32 { var d: D = {}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_invalid_subtyping.carbon:[[@LINE+1]]: type error in initializer of variable: 'class D*' is not implicitly convertible to 'class C*' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_invalid_subtyping.carbon:[[@LINE+1]]: type error in initializer of variable: 'class D*' is not implicitly convertible to 'class C*' var c: C* = &d; return 0; } diff --git a/explorer/testdata/class/fail_member_call_before_typecheck.carbon b/explorer/testdata/class/fail_member_call_before_typecheck.carbon index 801a6a828573..508cd6ad7da8 100644 --- a/explorer/testdata/class/fail_member_call_before_typecheck.carbon +++ b/explorer/testdata/class/fail_member_call_before_typecheck.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ class C { fn PickType() -> type { return i32; } // This is invalid even though `PickType` is defined earlier, because // checking of member bodies is deferred until after the class is completed. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_member_call_before_typecheck.carbon:[[@LINE+1]]: attempt to call function `PickType` that has not been fully type-checked + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_member_call_before_typecheck.carbon:[[@LINE+1]]: attempt to call function `PickType` that has not been fully type-checked fn GetZero() -> PickType() { return 0; } } diff --git a/explorer/testdata/class/fail_member_of_self.carbon b/explorer/testdata/class/fail_member_of_self.carbon index 258ec47aac43..dd56a0409f50 100644 --- a/explorer/testdata/class/fail_member_of_self.carbon +++ b/explorer/testdata/class/fail_member_of_self.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class C { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_member_of_self.carbon:[[@LINE+1]]: incomplete type `class C` used in type of variable + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_member_of_self.carbon:[[@LINE+1]]: incomplete type `class C` used in type of variable var m: Self; } diff --git a/explorer/testdata/class/fail_method_deduced.carbon b/explorer/testdata/class/fail_method_deduced.carbon index 0635c4832566..e68ea2004cdf 100644 --- a/explorer/testdata/class/fail_method_deduced.carbon +++ b/explorer/testdata/class/fail_method_deduced.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -17,7 +15,7 @@ fn H[T:! type](x: T) {} fn Main() -> i32 { H(C.F); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_method_deduced.carbon:[[@LINE+1]]: member name G can only be used in a member access or alias + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_method_deduced.carbon:[[@LINE+1]]: member name G can only be used in a member access or alias H(C.G); return 0; } diff --git a/explorer/testdata/class/fail_method_from_class.carbon b/explorer/testdata/class/fail_method_from_class.carbon index 09e62eb54513..dda92e382235 100644 --- a/explorer/testdata/class/fail_method_from_class.carbon +++ b/explorer/testdata/class/fail_method_from_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -22,6 +20,6 @@ class Point { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_method_from_class.carbon:[[@LINE+1]]: in call `Point.GetX()`, expected callee to be a function, found `member name GetX` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_method_from_class.carbon:[[@LINE+1]]: in call `Point.GetX()`, expected callee to be a function, found `member name GetX` return Point.GetX(); } diff --git a/explorer/testdata/class/fail_method_in_var.carbon b/explorer/testdata/class/fail_method_in_var.carbon index 547038e240d3..dca3564c6ef0 100644 --- a/explorer/testdata/class/fail_method_in_var.carbon +++ b/explorer/testdata/class/fail_method_in_var.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,7 +13,7 @@ class C { fn Main() -> i32 { var f: auto = C.F; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_method_in_var.carbon:[[@LINE+1]]: member name G can only be used in a member access or alias + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_method_in_var.carbon:[[@LINE+1]]: member name G can only be used in a member access or alias var g: auto = C.G; return 0; diff --git a/explorer/testdata/class/fail_override_virtual_with_non_virtual.carbon b/explorer/testdata/class/fail_override_virtual_with_non_virtual.carbon index a4ce89ddbc2c..6174d984aa81 100644 --- a/explorer/testdata/class/fail_override_virtual_with_non_virtual.carbon +++ b/explorer/testdata/class/fail_override_virtual_with_non_virtual.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ base class A { } class B extends A { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_override_virtual_with_non_virtual.carbon:[[@LINE+1]]: Error declaring `Foo`: method is declared virtual in base class, use `impl` to override it. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_override_virtual_with_non_virtual.carbon:[[@LINE+1]]: Error declaring `Foo`: method is declared virtual in base class, use `impl` to override it. fn Foo[self: Self]() {} } diff --git a/explorer/testdata/class/fail_qualified_method.carbon b/explorer/testdata/class/fail_qualified_method.carbon index faafc5909244..10b0ac72f31b 100644 --- a/explorer/testdata/class/fail_qualified_method.carbon +++ b/explorer/testdata/class/fail_qualified_method.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class Point { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_qualified_method.carbon:[[@LINE+1]]: qualified declaration names are not permitted in this context + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_qualified_method.carbon:[[@LINE+1]]: qualified declaration names are not permitted in this context fn Point.F[self: Self]() {} } diff --git a/explorer/testdata/class/fail_redeclare_virtual_method.carbon b/explorer/testdata/class/fail_redeclare_virtual_method.carbon index e2b52d5ec358..b110bd72829b 100644 --- a/explorer/testdata/class/fail_redeclare_virtual_method.carbon +++ b/explorer/testdata/class/fail_redeclare_virtual_method.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ base class C { } class D extends C { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_redeclare_virtual_method.carbon:[[@LINE+1]]: Error declaring `Foo`: method is declared virtual in base class, use `impl` to override it. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_redeclare_virtual_method.carbon:[[@LINE+1]]: Error declaring `Foo`: method is declared virtual in base class, use `impl` to override it. virtual fn Foo[self:Self]() {} } diff --git a/explorer/testdata/class/fail_return_method.carbon b/explorer/testdata/class/fail_return_method.carbon index 0ca1b7978053..454d76e3e856 100644 --- a/explorer/testdata/class/fail_return_method.carbon +++ b/explorer/testdata/class/fail_return_method.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ class C { } fn ReturnF() -> auto { return C.F; } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_return_method.carbon:[[@LINE+1]]: member name G can only be used in a member access or alias +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_return_method.carbon:[[@LINE+1]]: member name G can only be used in a member access or alias fn ReturnG() -> auto { return C.G; } fn Main() -> i32 { diff --git a/explorer/testdata/class/fail_use_before_typecheck.carbon b/explorer/testdata/class/fail_use_before_typecheck.carbon index 6eacbd0e3503..d438c91d54f1 100644 --- a/explorer/testdata/class/fail_use_before_typecheck.carbon +++ b/explorer/testdata/class/fail_use_before_typecheck.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class C { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_use_before_typecheck.carbon:[[@LINE+1]]: incomplete type `class C` used in member access + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_use_before_typecheck.carbon:[[@LINE+1]]: incomplete type `class C` used in member access var n: if not C.WrapInStruct() then i32 else {.n: i32}; fn WrapInStruct() -> bool { return true; } } diff --git a/explorer/testdata/class/fail_virtual_class_function.carbon b/explorer/testdata/class/fail_virtual_class_function.carbon index 12915b108b98..3a795c86689d 100644 --- a/explorer/testdata/class/fail_virtual_class_function.carbon +++ b/explorer/testdata/class/fail_virtual_class_function.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class C { virtual fn Foo() -> i32 { return 1; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_virtual_class_function.carbon:[[@LINE+1]]: Error declaring `Foo`: class functions cannot be virtual. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_virtual_class_function.carbon:[[@LINE+1]]: Error declaring `Foo`: class functions cannot be virtual. } } diff --git a/explorer/testdata/class/fail_virtual_method_absent.carbon b/explorer/testdata/class/fail_virtual_method_absent.carbon index 723b1e3db016..503e5bf39d34 100644 --- a/explorer/testdata/class/fail_virtual_method_absent.carbon +++ b/explorer/testdata/class/fail_virtual_method_absent.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,6 +17,6 @@ fn Main() -> i32 { var bp: B* = &b; var ap: A* = bp; // Shouldn't look into the vtable for B. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/class/fail_virtual_method_absent.carbon:[[@LINE+1]]: class A does not have a field named Foo + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/class/fail_virtual_method_absent.carbon:[[@LINE+1]]: class A does not have a field named Foo return ap->Foo(); } diff --git a/explorer/testdata/class/function_param.carbon b/explorer/testdata/class/function_param.carbon index cfe823b4bdb4..fcb17edef702 100644 --- a/explorer/testdata/class/function_param.carbon +++ b/explorer/testdata/class/function_param.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/global_var.carbon b/explorer/testdata/class/global_var.carbon index f4bce1f7452d..ebeaeefe12e9 100644 --- a/explorer/testdata/class/global_var.carbon +++ b/explorer/testdata/class/global_var.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/method.carbon b/explorer/testdata/class/method.carbon index c7c8c6eb8da3..096ad5d7e7e7 100644 --- a/explorer/testdata/class/method.carbon +++ b/explorer/testdata/class/method.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/method_call_method.carbon b/explorer/testdata/class/method_call_method.carbon index b66d45c69a30..358242d29f25 100644 --- a/explorer/testdata/class/method_call_method.carbon +++ b/explorer/testdata/class/method_call_method.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/method_self.carbon b/explorer/testdata/class/method_self.carbon index 15b98347591e..8f88632aa464 100644 --- a/explorer/testdata/class/method_self.carbon +++ b/explorer/testdata/class/method_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/new_and_delete.carbon b/explorer/testdata/class/new_and_delete.carbon index 29d40bf21bd7..0386e95c4a09 100644 --- a/explorer/testdata/class/new_and_delete.carbon +++ b/explorer/testdata/class/new_and_delete.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Allocate A // CHECK:STDOUT: DESTRUCTOR A // CHECK:STDOUT: Delete A diff --git a/explorer/testdata/class/new_and_delete_hierarchy.carbon b/explorer/testdata/class/new_and_delete_hierarchy.carbon index 733bedd3eb52..02308737b5a5 100644 --- a/explorer/testdata/class/new_and_delete_hierarchy.carbon +++ b/explorer/testdata/class/new_and_delete_hierarchy.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Allocate B // CHECK:STDOUT: DESTRUCTOR B // CHECK:STDOUT: DESTRUCTOR A diff --git a/explorer/testdata/class/non_virtual_dispatch.carbon b/explorer/testdata/class/non_virtual_dispatch.carbon index 7ec4252fed6f..fb09c480df98 100644 --- a/explorer/testdata/class/non_virtual_dispatch.carbon +++ b/explorer/testdata/class/non_virtual_dispatch.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: (*c).a: 1 // CHECK:STDOUT: (*c).Foo(): 1 // CHECK:STDOUT: (*c).Bar(): 1 diff --git a/explorer/testdata/class/non_virtual_dispatch_abstract.carbon b/explorer/testdata/class/non_virtual_dispatch_abstract.carbon index 82934b0cef9f..488c849ca621 100644 --- a/explorer/testdata/class/non_virtual_dispatch_abstract.carbon +++ b/explorer/testdata/class/non_virtual_dispatch_abstract.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: (*c).a: 1 // CHECK:STDOUT: (*c).Foo(): 1 // CHECK:STDOUT: (*c).Bar(): 1 diff --git a/explorer/testdata/class/parametrized_base_class.carbon b/explorer/testdata/class/parametrized_base_class.carbon index d921a78120c0..cbffaf301ca4 100644 --- a/explorer/testdata/class/parametrized_base_class.carbon +++ b/explorer/testdata/class/parametrized_base_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 2 // CHECK:STDOUT: 1 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/class/pointer_conversion.carbon b/explorer/testdata/class/pointer_conversion.carbon index cac15543e0d6..57830559ef73 100644 --- a/explorer/testdata/class/pointer_conversion.carbon +++ b/explorer/testdata/class/pointer_conversion.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 1 // CHECK:STDOUT: 2 // CHECK:STDOUT: 3 diff --git a/explorer/testdata/class/temp.carbon b/explorer/testdata/class/temp.carbon index 01c7d64b813e..b6996d3c9b6c 100644 --- a/explorer/testdata/class/temp.carbon +++ b/explorer/testdata/class/temp.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/type_of_type.carbon b/explorer/testdata/class/type_of_type.carbon index cf315db02bbb..c3cb45bdcbe1 100644 --- a/explorer/testdata/class/type_of_type.carbon +++ b/explorer/testdata/class/type_of_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/var.carbon b/explorer/testdata/class/var.carbon index 9c556e5257bf..5800f94a2e3b 100644 --- a/explorer/testdata/class/var.carbon +++ b/explorer/testdata/class/var.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/class/virtual_method.carbon b/explorer/testdata/class/virtual_method.carbon index 31a80ae80d03..5f753f6965c9 100644 --- a/explorer/testdata/class/virtual_method.carbon +++ b/explorer/testdata/class/virtual_method.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: c.Foo() -> 1 // CHECK:STDOUT: c.Bar() -> 2 // CHECK:STDOUT: d.Foo() -> 3 diff --git a/explorer/testdata/class/virtual_method_self.carbon b/explorer/testdata/class/virtual_method_self.carbon index 4abd0360de32..5e63af1308c2 100644 --- a/explorer/testdata/class/virtual_method_self.carbon +++ b/explorer/testdata/class/virtual_method_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: c.Foo(): 1 // CHECK:STDOUT: d.Foo(): 2 // CHECK:STDOUT: e.Foo(): 3 diff --git a/explorer/testdata/class/virtual_method_shadowed_attr.carbon b/explorer/testdata/class/virtual_method_shadowed_attr.carbon index e4ea4052382e..8a1d66b4f3dd 100644 --- a/explorer/testdata/class/virtual_method_shadowed_attr.carbon +++ b/explorer/testdata/class/virtual_method_shadowed_attr.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: c.Foo(): 1 // CHECK:STDOUT: d.Foo(): 2 // CHECK:STDOUT: (*cp).Foo(): 2 diff --git a/explorer/testdata/comparison/builtin_comparsion.carbon b/explorer/testdata/comparison/builtin_comparsion.carbon index 7f42c42893b5..2c523f4f264a 100644 --- a/explorer/testdata/comparison/builtin_comparsion.carbon +++ b/explorer/testdata/comparison/builtin_comparsion.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: strings less: 1 // CHECK:STDOUT: ints less: 0 // CHECK:STDOUT: strings less eq: 1 diff --git a/explorer/testdata/comparison/builtin_equality.carbon b/explorer/testdata/comparison/builtin_equality.carbon index 65b42092b75b..a61c420989ab 100644 --- a/explorer/testdata/comparison/builtin_equality.carbon +++ b/explorer/testdata/comparison/builtin_equality.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: bool: 1 // CHECK:STDOUT: bool: 1 // CHECK:STDOUT: bool: 1 diff --git a/explorer/testdata/comparison/custom_equality.carbon b/explorer/testdata/comparison/custom_equality.carbon index 02a5174cd8b0..04a848e3d986 100644 --- a/explorer/testdata/comparison/custom_equality.carbon +++ b/explorer/testdata/comparison/custom_equality.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: structs equal: 0 // CHECK:STDOUT: structs not equal: 1 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/comparison/empty_struct.carbon b/explorer/testdata/comparison/empty_struct.carbon index a0e349b2dc10..2f1f7c47303d 100644 --- a/explorer/testdata/comparison/empty_struct.carbon +++ b/explorer/testdata/comparison/empty_struct.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/comparison/fail_no_impl.carbon b/explorer/testdata/comparison/fail_no_impl.carbon index 70a4760c1851..00eb38457a41 100644 --- a/explorer/testdata/comparison/fail_no_impl.carbon +++ b/explorer/testdata/comparison/fail_no_impl.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/comparison/fail_no_impl.carbon:[[@LINE+1]]: i32 is not equality comparable with String (could not find implementation of interface EqWith(U = String) for i32) + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/comparison/fail_no_impl.carbon:[[@LINE+1]]: i32 is not equality comparable with String (could not find implementation of interface EqWith(U = String) for i32) Print("different types equal: {0}", if 1 == "1" then 1 else 0); return 0; } diff --git a/explorer/testdata/constraint/binding_dot_self_in_constraint.carbon b/explorer/testdata/constraint/binding_dot_self_in_constraint.carbon index 36e4e666d399..746ebd38f314 100644 --- a/explorer/testdata/constraint/binding_dot_self_in_constraint.carbon +++ b/explorer/testdata/constraint/binding_dot_self_in_constraint.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 6 package ExplorerTest api; diff --git a/explorer/testdata/constraint/binding_self.carbon b/explorer/testdata/constraint/binding_self.carbon index 42aaaaec06ca..4a090b4e2311 100644 --- a/explorer/testdata/constraint/binding_self.carbon +++ b/explorer/testdata/constraint/binding_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 12 package ExplorerTest api; diff --git a/explorer/testdata/constraint/combined_interfaces.carbon b/explorer/testdata/constraint/combined_interfaces.carbon index 1f71d132f803..4609d9344b71 100644 --- a/explorer/testdata/constraint/combined_interfaces.carbon +++ b/explorer/testdata/constraint/combined_interfaces.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 526 package ExplorerTest api; diff --git a/explorer/testdata/constraint/dot_self_is_other.carbon b/explorer/testdata/constraint/dot_self_is_other.carbon index dfd2f63dca49..b35533b41c73 100644 --- a/explorer/testdata/constraint/dot_self_is_other.carbon +++ b/explorer/testdata/constraint/dot_self_is_other.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 12 package ExplorerTest api; diff --git a/explorer/testdata/constraint/fail_ambiguous_member.carbon b/explorer/testdata/constraint/fail_ambiguous_member.carbon index afe39e07114a..a02f28760876 100644 --- a/explorer/testdata/constraint/fail_ambiguous_member.carbon +++ b/explorer/testdata/constraint/fail_ambiguous_member.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface A { fn F() -> i32; } interface B { fn F() -> i32; } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_ambiguous_member.carbon:[[@LINE+1]]: ambiguous member access, F found in interface A and interface B +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_ambiguous_member.carbon:[[@LINE+1]]: ambiguous member access, F found in interface A and interface B fn Get[T:! A & B](n: T) -> i32 { return n.F(); } impl i32 as A { diff --git a/explorer/testdata/constraint/fail_combine_equality.carbon b/explorer/testdata/constraint/fail_combine_equality.carbon index 54ebac0007d3..c748366c3cad 100644 --- a/explorer/testdata/constraint/fail_combine_equality.carbon +++ b/explorer/testdata/constraint/fail_combine_equality.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ impl i32 as I {} fn F(A:! i32, B:! i32, C:! i32, D:! i32, E:! i32, T:! I where A == B and C == D and C == E and B == D) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_combine_equality.carbon:[[@LINE+1]]: member access, F not in interface I where T impls interface I and A == B and C == D and C == E and B == D + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_combine_equality.carbon:[[@LINE+1]]: member access, F not in interface I where T impls interface I and A == B and C == D and C == E and B == D T.F(); } diff --git a/explorer/testdata/constraint/fail_dot_self_after_scope.carbon b/explorer/testdata/constraint/fail_dot_self_after_scope.carbon index 8c1ba3a12dff..04629f55011b 100644 --- a/explorer/testdata/constraint/fail_dot_self_after_scope.carbon +++ b/explorer/testdata/constraint/fail_dot_self_after_scope.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface FrobWith(T:! type) {} fn F[T:! FrobWith(.Self)] - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_dot_self_after_scope.carbon:[[@LINE+1]]: could not resolve '.Self' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_dot_self_after_scope.carbon:[[@LINE+1]]: could not resolve '.Self' (U: .Self) { } diff --git a/explorer/testdata/constraint/fail_dot_self_after_scope_2.carbon b/explorer/testdata/constraint/fail_dot_self_after_scope_2.carbon index a7106b3e3e74..c5950f679482 100644 --- a/explorer/testdata/constraint/fail_dot_self_after_scope_2.carbon +++ b/explorer/testdata/constraint/fail_dot_self_after_scope_2.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface FrobWith(T:! type) {} fn F[T:! FrobWith(.Self), - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_dot_self_after_scope_2.carbon:[[@LINE+1]]: `.Self` used in type of non-type generic binding `U` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_dot_self_after_scope_2.carbon:[[@LINE+1]]: `.Self` used in type of non-type generic binding `U` U:! .Self]() { } diff --git a/explorer/testdata/constraint/fail_dot_self_not_in_scope.carbon b/explorer/testdata/constraint/fail_dot_self_not_in_scope.carbon index 2209834fa29c..9fa8f64f9ea5 100644 --- a/explorer/testdata/constraint/fail_dot_self_not_in_scope.carbon +++ b/explorer/testdata/constraint/fail_dot_self_not_in_scope.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_dot_self_not_in_scope.carbon:[[@LINE+1]]: could not resolve '.Self' +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_dot_self_not_in_scope.carbon:[[@LINE+1]]: could not resolve '.Self' fn Main() -> .Self { return 0; } diff --git a/explorer/testdata/constraint/fail_infinite_self.carbon b/explorer/testdata/constraint/fail_infinite_self.carbon index adabfcdb444b..915cba6bde9c 100644 --- a/explorer/testdata/constraint/fail_infinite_self.carbon +++ b/explorer/testdata/constraint/fail_infinite_self.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_infinite_self.carbon:[[@LINE+1]]: `.Self` used in type of non-type generic binding `T` +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_infinite_self.carbon:[[@LINE+1]]: `.Self` used in type of non-type generic binding `T` fn F[T:! .Self]() {} fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/constraint/fail_infinite_self_ptr.carbon b/explorer/testdata/constraint/fail_infinite_self_ptr.carbon index 00251cf14b29..c68881f9dbce 100644 --- a/explorer/testdata/constraint/fail_infinite_self_ptr.carbon +++ b/explorer/testdata/constraint/fail_infinite_self_ptr.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_infinite_self_ptr.carbon:[[@LINE+1]]: `.Self` used in type of non-type generic binding `T` +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_infinite_self_ptr.carbon:[[@LINE+1]]: `.Self` used in type of non-type generic binding `T` fn F[T:! .Self*]() {} fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/constraint/fail_missing_member.carbon b/explorer/testdata/constraint/fail_missing_member.carbon index f6d52fac05ed..2d77c9766dd9 100644 --- a/explorer/testdata/constraint/fail_missing_member.carbon +++ b/explorer/testdata/constraint/fail_missing_member.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface A { fn F() -> i32; } interface B { fn G() -> i32; } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_missing_member.carbon:[[@LINE+1]]: member access, H not in interface A & interface B where T impls interface A and T impls interface B +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_missing_member.carbon:[[@LINE+1]]: member access, H not in interface A & interface B where T impls interface A and T impls interface B fn Get[T:! A & B](n: T) -> i32 { return n.H(); } impl i32 as A { diff --git a/explorer/testdata/constraint/fail_non_type_self.carbon b/explorer/testdata/constraint/fail_non_type_self.carbon index c579560c4f7e..0f3acfa34136 100644 --- a/explorer/testdata/constraint/fail_non_type_self.carbon +++ b/explorer/testdata/constraint/fail_non_type_self.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class X(T:! type) {} -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_non_type_self.carbon:[[@LINE+1]]: `.Self` used in type of non-type generic binding `T` +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_non_type_self.carbon:[[@LINE+1]]: `.Self` used in type of non-type generic binding `T` fn F[T:! X(.Self)](x: T) {} fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/constraint/fail_where_equals_different_types.carbon b/explorer/testdata/constraint/fail_where_equals_different_types.carbon index be948c6e9ab6..4f5f7a67a71a 100644 --- a/explorer/testdata/constraint/fail_where_equals_different_types.carbon +++ b/explorer/testdata/constraint/fail_where_equals_different_types.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface A {} -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_where_equals_different_types.carbon:[[@LINE+3]]: type mismatch between values in `where LHS == RHS` +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_where_equals_different_types.carbon:[[@LINE+3]]: type mismatch between values in `where LHS == RHS` // CHECK:STDERR: LHS type: i32 // CHECK:STDERR: RHS type: type alias B = A where 4 == i32; diff --git a/explorer/testdata/constraint/fail_where_impls_non_constraint.carbon b/explorer/testdata/constraint/fail_where_impls_non_constraint.carbon index 230de8280789..2c5075fe8dcc 100644 --- a/explorer/testdata/constraint/fail_where_impls_non_constraint.carbon +++ b/explorer/testdata/constraint/fail_where_impls_non_constraint.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface A {} -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_where_impls_non_constraint.carbon:[[@LINE+1]]: expected a constraint in expression after `impls`, found i32 +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_where_impls_non_constraint.carbon:[[@LINE+1]]: expected a constraint in expression after `impls`, found i32 alias B = A where i32 impls i32; fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/constraint/fail_where_impls_non_type.carbon b/explorer/testdata/constraint/fail_where_impls_non_type.carbon index cfed8113b00b..4deaf87a1e40 100644 --- a/explorer/testdata/constraint/fail_where_impls_non_type.carbon +++ b/explorer/testdata/constraint/fail_where_impls_non_type.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface A {} -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_where_impls_non_type.carbon:[[@LINE+1]]: expression after `impls` does not resolve to a constraint, found i32 +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_where_impls_non_type.carbon:[[@LINE+1]]: expression after `impls` does not resolve to a constraint, found i32 alias B = A where i32 impls 5; fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/constraint/fail_where_non_type_impls.carbon b/explorer/testdata/constraint/fail_where_non_type_impls.carbon index 9edcef50960c..9a6feecd0b88 100644 --- a/explorer/testdata/constraint/fail_where_non_type_impls.carbon +++ b/explorer/testdata/constraint/fail_where_non_type_impls.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface A {} -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/constraint/fail_where_non_type_impls.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/constraint/fail_where_non_type_impls.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' alias B = A where 4 impls A; fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/constraint/nondependent_where.carbon b/explorer/testdata/constraint/nondependent_where.carbon index 6d418581c80f..bb538ec579d8 100644 --- a/explorer/testdata/constraint/nondependent_where.carbon +++ b/explorer/testdata/constraint/nondependent_where.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/constraint/qualified_lookup_in_where.carbon b/explorer/testdata/constraint/qualified_lookup_in_where.carbon index 0f00e468154c..d6cfd95df95f 100644 --- a/explorer/testdata/constraint/qualified_lookup_in_where.carbon +++ b/explorer/testdata/constraint/qualified_lookup_in_where.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 122 package ExplorerTest api; diff --git a/explorer/testdata/constraint/rewrite.carbon b/explorer/testdata/constraint/rewrite.carbon index 9dfda97482da..3c789e91bc80 100644 --- a/explorer/testdata/constraint/rewrite.carbon +++ b/explorer/testdata/constraint/rewrite.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 12 package ExplorerTest api; diff --git a/explorer/testdata/constraint/rewrite_compound.carbon b/explorer/testdata/constraint/rewrite_compound.carbon index bb1d55b26181..ecd83ef11fb0 100644 --- a/explorer/testdata/constraint/rewrite_compound.carbon +++ b/explorer/testdata/constraint/rewrite_compound.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/constraint/rewrite_compound_2.carbon b/explorer/testdata/constraint/rewrite_compound_2.carbon index 2337bdd6c9c1..66c1e582d3a7 100644 --- a/explorer/testdata/constraint/rewrite_compound_2.carbon +++ b/explorer/testdata/constraint/rewrite_compound_2.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/constraint/rewrite_in_qualifier.carbon b/explorer/testdata/constraint/rewrite_in_qualifier.carbon index e93138b97fc2..ef3ee37b6182 100644 --- a/explorer/testdata/constraint/rewrite_in_qualifier.carbon +++ b/explorer/testdata/constraint/rewrite_in_qualifier.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 2 package ExplorerTest api; diff --git a/explorer/testdata/constraint/rewrite_in_qualifier_and_type.carbon b/explorer/testdata/constraint/rewrite_in_qualifier_and_type.carbon index 23ce811aedc7..ae1de8e7f70c 100644 --- a/explorer/testdata/constraint/rewrite_in_qualifier_and_type.carbon +++ b/explorer/testdata/constraint/rewrite_in_qualifier_and_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/constraint/type_of_type.carbon b/explorer/testdata/constraint/type_of_type.carbon index 27bf9fb75d36..0077ae410628 100644 --- a/explorer/testdata/constraint/type_of_type.carbon +++ b/explorer/testdata/constraint/type_of_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/constraint/where_impls.carbon b/explorer/testdata/constraint/where_impls.carbon index 0d0f8f4f33c9..8d071898d48b 100644 --- a/explorer/testdata/constraint/where_impls.carbon +++ b/explorer/testdata/constraint/where_impls.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: i32.F // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/constraint/where_multiple_equality.carbon b/explorer/testdata/constraint/where_multiple_equality.carbon index 1619f6c68657..6f9f6d3894d5 100644 --- a/explorer/testdata/constraint/where_multiple_equality.carbon +++ b/explorer/testdata/constraint/where_multiple_equality.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/constraint/where_self.carbon b/explorer/testdata/constraint/where_self.carbon index 27d2a2361252..92ac99228aa5 100644 --- a/explorer/testdata/constraint/where_self.carbon +++ b/explorer/testdata/constraint/where_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 12 package ExplorerTest api; diff --git a/explorer/testdata/destructor/call_destructor_from_destructor.carbon b/explorer/testdata/destructor/call_destructor_from_destructor.carbon index db065a734707..f15dfd9788e7 100644 --- a/explorer/testdata/destructor/call_destructor_from_destructor.carbon +++ b/explorer/testdata/destructor/call_destructor_from_destructor.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: DESTRUCTOR A 1 // CHECK:STDOUT: DESTRUCTOR B 2 // CHECK:STDOUT: DESTRUCTOR A 3 diff --git a/explorer/testdata/destructor/destroy_array.carbon b/explorer/testdata/destructor/destroy_array.carbon index 0ba85222d9de..5f8733bd9a74 100644 --- a/explorer/testdata/destructor/destroy_array.carbon +++ b/explorer/testdata/destructor/destroy_array.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: DESTRUCTOR A 1 // CHECK:STDOUT: DESTRUCTOR A 2 // CHECK:STDOUT: DESTRUCTOR A 3 diff --git a/explorer/testdata/destructor/destroy_base_class.carbon b/explorer/testdata/destructor/destroy_base_class.carbon index 67b5eb8804f9..228a2416fb47 100644 --- a/explorer/testdata/destructor/destroy_base_class.carbon +++ b/explorer/testdata/destructor/destroy_base_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: DESTRUCTOR C 3 // CHECK:STDOUT: DESTRUCTOR A 1 // CHECK:STDOUT: result: 1 diff --git a/explorer/testdata/destructor/destroy_base_class_and_members.carbon b/explorer/testdata/destructor/destroy_base_class_and_members.carbon index 12afb27e2833..1864db29a3d6 100644 --- a/explorer/testdata/destructor/destroy_base_class_and_members.carbon +++ b/explorer/testdata/destructor/destroy_base_class_and_members.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Destroying 0 (C) // CHECK:STDOUT: Destroying 1 // CHECK:STDOUT: Destroying 2 diff --git a/explorer/testdata/destructor/destroy_different_types.carbon b/explorer/testdata/destructor/destroy_different_types.carbon index 1e79258d91ad..53f9296f8b26 100644 --- a/explorer/testdata/destructor/destroy_different_types.carbon +++ b/explorer/testdata/destructor/destroy_different_types.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: DESTRUCTOR A 0 // CHECK:STDOUT: DESTRUCTOR A 1 // CHECK:STDOUT: DESTRUCTOR A 2 diff --git a/explorer/testdata/destructor/destroy_inner_destructor.carbon b/explorer/testdata/destructor/destroy_inner_destructor.carbon index 894ab2b49664..225922c4dfa0 100644 --- a/explorer/testdata/destructor/destroy_inner_destructor.carbon +++ b/explorer/testdata/destructor/destroy_inner_destructor.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: DESTRUCTOR A 1 // CHECK:STDOUT: DESTRUCTOR B 2 // CHECK:STDOUT: result: 1 diff --git a/explorer/testdata/destructor/destructor_with_return.carbon b/explorer/testdata/destructor/destructor_with_return.carbon index 24fc688873ca..53c7215e2612 100644 --- a/explorer/testdata/destructor/destructor_with_return.carbon +++ b/explorer/testdata/destructor/destructor_with_return.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: DESTRUCTOR A 3 // CHECK:STDOUT: result: 1 diff --git a/explorer/testdata/destructor/dont_call_in_method.carbon b/explorer/testdata/destructor/dont_call_in_method.carbon index 9f45847e4731..921d8866f3c6 100644 --- a/explorer/testdata/destructor/dont_call_in_method.carbon +++ b/explorer/testdata/destructor/dont_call_in_method.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: TEST // CHECK:STDOUT: TEST 2 // CHECK:STDOUT: DESTRUCTOR A 1 diff --git a/explorer/testdata/destructor/fail_addr.carbon b/explorer/testdata/destructor/fail_addr.carbon index 54a602a39305..7910f8fef221 100644 --- a/explorer/testdata/destructor/fail_addr.carbon +++ b/explorer/testdata/destructor/fail_addr.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; @@ -12,7 +10,7 @@ class A { destructor[addr self: Self*] { self->n += 1; Print("DESTRUCTOR A {0}", self->n); - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/destructor/fail_addr.carbon:[[@LINE+1]]: destructors currently don't support `addr self` bindings + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/destructor/fail_addr.carbon:[[@LINE+1]]: destructors currently don't support `addr self` bindings } var n: i32; diff --git a/explorer/testdata/destructor/fail_delete_base_without_virtual_destructor.carbon b/explorer/testdata/destructor/fail_delete_base_without_virtual_destructor.carbon index 24533d34f4dc..4c37f482ceac 100644 --- a/explorer/testdata/destructor/fail_delete_base_without_virtual_destructor.carbon +++ b/explorer/testdata/destructor/fail_delete_base_without_virtual_destructor.carbon @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} -// CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/data/prelude.carbon:{{.*}}: Deallocating a derived class from base class pointer requires a virtual destructor +// CHECK:STDERR: RUNTIME ERROR: explorer/data/prelude.carbon:{{.*}}: Deallocating a derived class from base class pointer requires a virtual destructor package ExplorerTest api; diff --git a/explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon b/explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon index 8a9dc96cb9bc..3b49ae23ead0 100644 --- a/explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon +++ b/explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ class A{ } destructor[self: Self]{ Print("DESTRUCTOR A2 {0}",self.n); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon:[[@LINE+1]]: Duplicate name `destructor` also found at {{.*}}/explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon:[[@LINE-3]] + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon:[[@LINE+1]]: Duplicate name `destructor` also found at explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon:[[@LINE-3]] } var n: i32; } diff --git a/explorer/testdata/destructor/fail_override_abstract.carbon b/explorer/testdata/destructor/fail_override_abstract.carbon index a7539ddaeacb..8e294dd24990 100644 --- a/explorer/testdata/destructor/fail_override_abstract.carbon +++ b/explorer/testdata/destructor/fail_override_abstract.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; base class A { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/destructor/fail_override_abstract.carbon:[[@LINE+1]]: syntax error, unexpected DESTRUCTOR, expecting CLASS + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/destructor/fail_override_abstract.carbon:[[@LINE+1]]: syntax error, unexpected DESTRUCTOR, expecting CLASS abstract destructor[self: Self]{} } diff --git a/explorer/testdata/destructor/fail_override_impl_none.carbon b/explorer/testdata/destructor/fail_override_impl_none.carbon index f3a4734c93c3..b6bddc19582f 100644 --- a/explorer/testdata/destructor/fail_override_impl_none.carbon +++ b/explorer/testdata/destructor/fail_override_impl_none.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; base class A { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/destructor/fail_override_impl_none.carbon:[[@LINE+1]]: Error declaring destructor for `A`: cannot override a destructor that is not declared `virtual` in base class. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/destructor/fail_override_impl_none.carbon:[[@LINE+1]]: Error declaring destructor for `A`: cannot override a destructor that is not declared `virtual` in base class. impl destructor[self: Self]{} } diff --git a/explorer/testdata/destructor/fail_override_virtual_virtual.carbon b/explorer/testdata/destructor/fail_override_virtual_virtual.carbon index 45ba9cb81032..299dca74a317 100644 --- a/explorer/testdata/destructor/fail_override_virtual_virtual.carbon +++ b/explorer/testdata/destructor/fail_override_virtual_virtual.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ base class A { } class B extends A { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/destructor/fail_override_virtual_virtual.carbon:[[@LINE+1]]: Error declaring destructor for `B`: use `impl` to implement virtual destructor in child class. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/destructor/fail_override_virtual_virtual.carbon:[[@LINE+1]]: Error declaring destructor for `B`: use `impl` to implement virtual destructor in child class. virtual destructor[self: Self]{} } diff --git a/explorer/testdata/destructor/function_with_return.carbon b/explorer/testdata/destructor/function_with_return.carbon index e3f1f39eb489..823c8f52f688 100644 --- a/explorer/testdata/destructor/function_with_return.carbon +++ b/explorer/testdata/destructor/function_with_return.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: DESTRUCTOR C 1 // CHECK:STDOUT: DESTRUCTOR B 2 // CHECK:STDOUT: DESTRUCTOR A 3 diff --git a/explorer/testdata/destructor/loop_block.carbon b/explorer/testdata/destructor/loop_block.carbon index 362253ff83e8..8cc3aafe567c 100644 --- a/explorer/testdata/destructor/loop_block.carbon +++ b/explorer/testdata/destructor/loop_block.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: DESTRUCTOR A 1 // CHECK:STDOUT: DESTRUCTOR A 2 // CHECK:STDOUT: DESTRUCTOR A 3 diff --git a/explorer/testdata/destructor/loop_break_continue.carbon b/explorer/testdata/destructor/loop_break_continue.carbon index 9a590b0e268a..f80215b503c6 100644 --- a/explorer/testdata/destructor/loop_break_continue.carbon +++ b/explorer/testdata/destructor/loop_break_continue.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: DESTRUCTOR A 1 // CHECK:STDOUT: DESTRUCTOR A 2 // CHECK:STDOUT: DESTRUCTOR A 3 diff --git a/explorer/testdata/destructor/nested_block_with_return.carbon b/explorer/testdata/destructor/nested_block_with_return.carbon index 0b9ffd740ccf..5c6264444b2b 100644 --- a/explorer/testdata/destructor/nested_block_with_return.carbon +++ b/explorer/testdata/destructor/nested_block_with_return.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: DESTRUCTOR A 1 // CHECK:STDOUT: DESTRUCTOR A 2 // CHECK:STDOUT: DESTRUCTOR A 3 diff --git a/explorer/testdata/destructor/virtual_destructor.carbon b/explorer/testdata/destructor/virtual_destructor.carbon index 5fe4f6ea1f15..a3459eb713a4 100644 --- a/explorer/testdata/destructor/virtual_destructor.carbon +++ b/explorer/testdata/destructor/virtual_destructor.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Allocate C // CHECK:STDOUT: DESTRUCTOR C // CHECK:STDOUT: DESTRUCTOR B diff --git a/explorer/testdata/destructor/virtual_destructor_nested.carbon b/explorer/testdata/destructor/virtual_destructor_nested.carbon index 09cb2184b8bb..9857f1079095 100644 --- a/explorer/testdata/destructor/virtual_destructor_nested.carbon +++ b/explorer/testdata/destructor/virtual_destructor_nested.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Allocate D // CHECK:STDOUT: DESTRUCTOR B // CHECK:STDOUT: DESTRUCTOR A diff --git a/explorer/testdata/for/fail_convert.carbon b/explorer/testdata/for/fail_convert.carbon index 49e074c638ba..24eeef6accbb 100644 --- a/explorer/testdata/for/fail_convert.carbon +++ b/explorer/testdata/for/fail_convert.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -22,7 +20,7 @@ fn Main() -> i32 { // representation to describe the conversion. for (x: IntLike in arr) { Print("{0}", x.n); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/for/fail_convert.carbon:[[@LINE+3]]: type error in `for` pattern + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/for/fail_convert.carbon:[[@LINE+3]]: type error in `for` pattern // CHECK:STDERR: expected: i32 // CHECK:STDERR: actual: class IntLike } diff --git a/explorer/testdata/for/for_loop.carbon b/explorer/testdata/for/for_loop.carbon index b024ecbb0930..7204adccadd3 100644 --- a/explorer/testdata/for/for_loop.carbon +++ b/explorer/testdata/for/for_loop.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: HALLO WELT 0 // CHECK:STDOUT: HALLO WELT 1 // CHECK:STDOUT: HALLO WELT 2 diff --git a/explorer/testdata/for/for_loop_auto.carbon b/explorer/testdata/for/for_loop_auto.carbon index c8128083c89d..9d5ce7916ffd 100644 --- a/explorer/testdata/for/for_loop_auto.carbon +++ b/explorer/testdata/for/for_loop_auto.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: HALLO WELT 0 // CHECK:STDOUT: HALLO WELT 1 // CHECK:STDOUT: HALLO WELT 2 diff --git a/explorer/testdata/for/for_loop_break.carbon b/explorer/testdata/for/for_loop_break.carbon index ce5c6558f70e..d63f329937e9 100644 --- a/explorer/testdata/for/for_loop_break.carbon +++ b/explorer/testdata/for/for_loop_break.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/for/for_loop_continue.carbon b/explorer/testdata/for/for_loop_continue.carbon index ec368dcdc8cf..a3160f1ddfb6 100644 --- a/explorer/testdata/for/for_loop_continue.carbon +++ b/explorer/testdata/for/for_loop_continue.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 4 package ExplorerTest api; diff --git a/explorer/testdata/for/for_loop_empty.carbon b/explorer/testdata/for/for_loop_empty.carbon index 6ebc10b00e58..2355caa81d4e 100644 --- a/explorer/testdata/for/for_loop_empty.carbon +++ b/explorer/testdata/for/for_loop_empty.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/for/for_loop_nested.carbon b/explorer/testdata/for/for_loop_nested.carbon index 9ed5fbc2cca7..b2ebf22291a8 100644 --- a/explorer/testdata/for/for_loop_nested.carbon +++ b/explorer/testdata/for/for_loop_nested.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 20 package ExplorerTest api; diff --git a/explorer/testdata/function/auto_return/add.carbon b/explorer/testdata/function/auto_return/add.carbon index 370953f1e42c..c574e7dc230b 100644 --- a/explorer/testdata/function/auto_return/add.carbon +++ b/explorer/testdata/function/auto_return/add.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/auto_return/fail_direct_recurse.carbon b/explorer/testdata/function/auto_return/fail_direct_recurse.carbon index ba4befc08f7c..f78a7ab8ba35 100644 --- a/explorer/testdata/function/auto_return/fail_direct_recurse.carbon +++ b/explorer/testdata/function/auto_return/fail_direct_recurse.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ package ExplorerTest api; // used. fn Recurse(x: i32, do_recurse: bool) -> auto { if (do_recurse) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/auto_return/fail_direct_recurse.carbon:[[@LINE+1]]: Function calls itself, but has a deduced return type + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/auto_return/fail_direct_recurse.carbon:[[@LINE+1]]: Function calls itself, but has a deduced return type Recurse(x, false); } return x; diff --git a/explorer/testdata/function/auto_return/fail_multiple_returns.carbon b/explorer/testdata/function/auto_return/fail_multiple_returns.carbon index e1981d602032..791be6a47bb4 100644 --- a/explorer/testdata/function/auto_return/fail_multiple_returns.carbon +++ b/explorer/testdata/function/auto_return/fail_multiple_returns.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ fn ComputeSum(x: i32, y: i32) -> auto { if (x == 0) { return x; } else if (y == 0) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/auto_return/fail_multiple_returns.carbon:[[@LINE+1]]: Only one return is allowed in a function with an `auto` return type. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/auto_return/fail_multiple_returns.carbon:[[@LINE+1]]: Only one return is allowed in a function with an `auto` return type. return y; } else { return x + y; diff --git a/explorer/testdata/function/auto_return/fail_no_return.carbon b/explorer/testdata/function/auto_return/fail_no_return.carbon index 1fe8079f0b7a..d538b1bd1d5c 100644 --- a/explorer/testdata/function/auto_return/fail_no_return.carbon +++ b/explorer/testdata/function/auto_return/fail_no_return.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn NoReturn() -> auto { -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/auto_return/fail_no_return.carbon:[[@LINE+1]]: control-flow reaches end of function that provides a `->` return type without reaching a return statement +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/auto_return/fail_no_return.carbon:[[@LINE+1]]: control-flow reaches end of function that provides a `->` return type without reaching a return statement } fn Main() { diff --git a/explorer/testdata/function/auto_return/fail_separate_decl.carbon b/explorer/testdata/function/auto_return/fail_separate_decl.carbon index ec58f907a7fd..91ba9cda61b2 100644 --- a/explorer/testdata/function/auto_return/fail_separate_decl.carbon +++ b/explorer/testdata/function/auto_return/fail_separate_decl.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; // This declaration is not allowed. -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/auto_return/fail_separate_decl.carbon:[[@LINE+1]]: Function declaration has deduced return type but no body +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/auto_return/fail_separate_decl.carbon:[[@LINE+1]]: Function declaration has deduced return type but no body fn ComputeSum(x: i32, y: i32) -> auto; fn Main() -> i32 { diff --git a/explorer/testdata/function/auto_return/modify_arg_type.carbon b/explorer/testdata/function/auto_return/modify_arg_type.carbon index adf1cef918c1..b8e0b2e3895c 100644 --- a/explorer/testdata/function/auto_return/modify_arg_type.carbon +++ b/explorer/testdata/function/auto_return/modify_arg_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/auto_return/modify_return_type.carbon b/explorer/testdata/function/auto_return/modify_return_type.carbon index e15587e7aa53..ef3d48b7eac9 100644 --- a/explorer/testdata/function/auto_return/modify_return_type.carbon +++ b/explorer/testdata/function/auto_return/modify_return_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/auto_return/type.carbon b/explorer/testdata/function/auto_return/type.carbon index 42a2c545d17a..a9d7c40c116b 100644 --- a/explorer/testdata/function/auto_return/type.carbon +++ b/explorer/testdata/function/auto_return/type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/convert_args.carbon b/explorer/testdata/function/convert_args.carbon index aa2b38cb8d70..e584ba7b6929 100644 --- a/explorer/testdata/function/convert_args.carbon +++ b/explorer/testdata/function/convert_args.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 123 package ExplorerTest api; diff --git a/explorer/testdata/function/empty_params.carbon b/explorer/testdata/function/empty_params.carbon index b4fcee863efd..7492c25b4a8a 100644 --- a/explorer/testdata/function/empty_params.carbon +++ b/explorer/testdata/function/empty_params.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/fail_call_undefined.carbon b/explorer/testdata/function/fail_call_undefined.carbon index f6e4bc97ac53..528b851ee548 100644 --- a/explorer/testdata/function/fail_call_undefined.carbon +++ b/explorer/testdata/function/fail_call_undefined.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn F() -> i32; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/function/fail_call_undefined.carbon:[[@LINE+1]]: attempt to call function `F` that has not been defined + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/function/fail_call_undefined.carbon:[[@LINE+1]]: attempt to call function `F` that has not been defined return F(); } diff --git a/explorer/testdata/function/fail_call_undefined_main.carbon b/explorer/testdata/function/fail_call_undefined_main.carbon index b20f37fc8a48..7677c9ee5aa4 100644 --- a/explorer/testdata/function/fail_call_undefined_main.carbon +++ b/explorer/testdata/function/fail_call_undefined_main.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} // CHECK:STDERR: RUNTIME ERROR: :0: attempt to call function `Main` that has not been defined package ExplorerTest api; diff --git a/explorer/testdata/function/fail_call_with_tuple.carbon b/explorer/testdata/function/fail_call_with_tuple.carbon index d9612127ac64..69f662be6c51 100644 --- a/explorer/testdata/function/fail_call_with_tuple.carbon +++ b/explorer/testdata/function/fail_call_with_tuple.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,6 +11,6 @@ fn f(x: i32, y: i32) -> i32 { return x + y; } fn Main() -> i32 { var xy: (i32, i32) = (1, 2); // should fail to type-check - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_call_with_tuple.carbon:[[@LINE+1]]: wrong number of arguments in function call, expected 2 but got 1 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/fail_call_with_tuple.carbon:[[@LINE+1]]: wrong number of arguments in function call, expected 2 but got 1 return f(xy); } diff --git a/explorer/testdata/function/fail_invalid_fnty.carbon b/explorer/testdata/function/fail_invalid_fnty.carbon index 4181a0c097bd..b7ae5c207d3e 100644 --- a/explorer/testdata/function/fail_invalid_fnty.carbon +++ b/explorer/testdata/function/fail_invalid_fnty.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_invalid_fnty.carbon:[[@LINE+2]]: type error in `-`: +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/fail_invalid_fnty.carbon:[[@LINE+2]]: type error in `-`: // CHECK:STDERR: could not find implementation of interface Negate for bool fn f(g: __Fn(-true) -> true) { } diff --git a/explorer/testdata/function/fail_main_with_parameters.carbon b/explorer/testdata/function/fail_main_with_parameters.carbon index 700a44d2cdcb..d7c68b66cb80 100644 --- a/explorer/testdata/function/fail_main_with_parameters.carbon +++ b/explorer/testdata/function/fail_main_with_parameters.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main(i: i32) -> i32 { return 0; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_main_with_parameters.carbon:[[@LINE+1]]: `Main` must not take any parameters +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/fail_main_with_parameters.carbon:[[@LINE+1]]: `Main` must not take any parameters } diff --git a/explorer/testdata/function/fail_match_no_return.carbon b/explorer/testdata/function/fail_match_no_return.carbon index c49d46dbeac0..409d21ef907a 100644 --- a/explorer/testdata/function/fail_match_no_return.carbon +++ b/explorer/testdata/function/fail_match_no_return.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32 = 0; match(0) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_match_no_return.carbon:[[@LINE+1]]: control-flow reaches end of function that provides a `->` return type without reaching a return statement + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/fail_match_no_return.carbon:[[@LINE+1]]: control-flow reaches end of function that provides a `->` return type without reaching a return statement case 1 => { x = 1; } case _: auto => { x = 2; } } diff --git a/explorer/testdata/function/fail_match_partial_return.carbon b/explorer/testdata/function/fail_match_partial_return.carbon index 8efa5d21dcc1..ab0557a64495 100644 --- a/explorer/testdata/function/fail_match_partial_return.carbon +++ b/explorer/testdata/function/fail_match_partial_return.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32 = 0; match (0) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_match_partial_return.carbon:[[@LINE+1]]: control-flow reaches end of function that provides a `->` return type without reaching a return statement + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/fail_match_partial_return.carbon:[[@LINE+1]]: control-flow reaches end of function that provides a `->` return type without reaching a return statement case 1 => { x = 1; } case _: auto => { return 0; } } diff --git a/explorer/testdata/function/fail_non_exhaustive_match.carbon b/explorer/testdata/function/fail_non_exhaustive_match.carbon index 9adb68412026..ec4a76a6573a 100644 --- a/explorer/testdata/function/fail_non_exhaustive_match.carbon +++ b/explorer/testdata/function/fail_non_exhaustive_match.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,5 +11,5 @@ fn Main() -> i32 { match (n) { case 1 => { return 0; } } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_non_exhaustive_match.carbon:[[@LINE+1]]: non-exhaustive match may allow control-flow to reach the end of a function that provides a `->` return type +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/fail_non_exhaustive_match.carbon:[[@LINE+1]]: non-exhaustive match may allow control-flow to reach the end of a function that provides a `->` return type } diff --git a/explorer/testdata/function/fail_parameter_type.carbon b/explorer/testdata/function/fail_parameter_type.carbon index 1705dd2a4d8c..ea968404f022 100644 --- a/explorer/testdata/function/fail_parameter_type.carbon +++ b/explorer/testdata/function/fail_parameter_type.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; // 42 cannot be used as the type of a parameter. -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_parameter_type.carbon:[[@LINE+1]]: type error in type of name binding: 'i32' is not implicitly convertible to 'type' +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/fail_parameter_type.carbon:[[@LINE+1]]: type error in type of name binding: 'i32' is not implicitly convertible to 'type' fn f(x: 42) -> i32 { return x - 1; } diff --git a/explorer/testdata/function/fail_parameter_type_only.carbon b/explorer/testdata/function/fail_parameter_type_only.carbon index abd26bd8b6e0..6a547277b29d 100644 --- a/explorer/testdata/function/fail_parameter_type_only.carbon +++ b/explorer/testdata/function/fail_parameter_type_only.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_parameter_type_only.carbon:[[@LINE+1]]: An irrefutable pattern is required, but `i32` is refutable. +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/fail_parameter_type_only.carbon:[[@LINE+1]]: An irrefutable pattern is required, but `i32` is refutable. fn f(x: i32, i32) {} fn Main() -> i32 { diff --git a/explorer/testdata/function/fail_recurse_before_typecheck.carbon b/explorer/testdata/function/fail_recurse_before_typecheck.carbon index 60db2d63aaed..5e0298e28a49 100644 --- a/explorer/testdata/function/fail_recurse_before_typecheck.carbon +++ b/explorer/testdata/function/fail_recurse_before_typecheck.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn T() -> type { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_recurse_before_typecheck.carbon:[[@LINE+1]]: attempt to call function `T` that has not been fully type-checked + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/fail_recurse_before_typecheck.carbon:[[@LINE+1]]: attempt to call function `T` that has not been fully type-checked var v: T() = 0; return i32; } diff --git a/explorer/testdata/function/fail_recurse_in_return_type.carbon b/explorer/testdata/function/fail_recurse_in_return_type.carbon index b331345a6dc9..36ea1c6a50dc 100644 --- a/explorer/testdata/function/fail_recurse_in_return_type.carbon +++ b/explorer/testdata/function/fail_recurse_in_return_type.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_recurse_in_return_type.carbon:[[@LINE+1]]: 'T' is not usable until after it has been completely declared +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/fail_recurse_in_return_type.carbon:[[@LINE+1]]: 'T' is not usable until after it has been completely declared fn T() -> T() { return i32; } fn Main() -> i32 { diff --git a/explorer/testdata/function/fail_return_call_has_invalid_body.carbon b/explorer/testdata/function/fail_return_call_has_invalid_body.carbon index 042612991c0e..66dba1840d23 100644 --- a/explorer/testdata/function/fail_return_call_has_invalid_body.carbon +++ b/explorer/testdata/function/fail_return_call_has_invalid_body.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package EmptyIdentifier impl; fn apply[T:! type, U:! type](f: T, EmptyIdentifier: U) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_return_call_has_invalid_body.carbon:[[@LINE+1]]: only arrays and tuples can be indexed, found bool + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/fail_return_call_has_invalid_body.carbon:[[@LINE+1]]: only arrays and tuples can be indexed, found bool match (true[true]) {} } diff --git a/explorer/testdata/function/fail_var_type_is_call.carbon b/explorer/testdata/function/fail_var_type_is_call.carbon index 721c8465cf90..1c9e187bc016 100644 --- a/explorer/testdata/function/fail_var_type_is_call.carbon +++ b/explorer/testdata/function/fail_var_type_is_call.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package EmptyIdentifier impl; @@ -13,7 +11,7 @@ fn test() -> i32 { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_var_type_is_call.carbon:[[@LINE+1]]: type error in type of name binding: 'i32' is not implicitly convertible to 'type' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/function/fail_var_type_is_call.carbon:[[@LINE+1]]: type error in type of name binding: 'i32' is not implicitly convertible to 'type' var x: test() = 1; return 0; } diff --git a/explorer/testdata/function/fnty.carbon b/explorer/testdata/function/fnty.carbon index cf80290b587e..bd575721370c 100644 --- a/explorer/testdata/function/fnty.carbon +++ b/explorer/testdata/function/fnty.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/ignored_parameter.carbon b/explorer/testdata/function/ignored_parameter.carbon index b5b498fe6d85..f80e7d911a92 100644 --- a/explorer/testdata/function/ignored_parameter.carbon +++ b/explorer/testdata/function/ignored_parameter.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/multiple_args.carbon b/explorer/testdata/function/multiple_args.carbon index c7da9a507577..c072ef7d303b 100644 --- a/explorer/testdata/function/multiple_args.carbon +++ b/explorer/testdata/function/multiple_args.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/non_exhaustive_match_no_return_type.carbon b/explorer/testdata/function/non_exhaustive_match_no_return_type.carbon index e80b10c7b0fc..590475adf2f7 100644 --- a/explorer/testdata/function/non_exhaustive_match_no_return_type.carbon +++ b/explorer/testdata/function/non_exhaustive_match_no_return_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/non_exhaustive_match_return.carbon b/explorer/testdata/function/non_exhaustive_match_return.carbon index b9db5df5cc4a..0d8151d4d252 100644 --- a/explorer/testdata/function/non_exhaustive_match_return.carbon +++ b/explorer/testdata/function/non_exhaustive_match_return.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/function/param_lifetime.carbon b/explorer/testdata/function/param_lifetime.carbon index e61ceb0a5252..283c002f6392 100644 --- a/explorer/testdata/function/param_lifetime.carbon +++ b/explorer/testdata/function/param_lifetime.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/recursive.carbon b/explorer/testdata/function/recursive.carbon index 7f4fd9045135..7d5058783889 100644 --- a/explorer/testdata/function/recursive.carbon +++ b/explorer/testdata/function/recursive.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/return.carbon b/explorer/testdata/function/return.carbon index ac3fba4dfad8..6442b1afc6ea 100644 --- a/explorer/testdata/function/return.carbon +++ b/explorer/testdata/function/return.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/return_convertible_to_type.carbon b/explorer/testdata/function/return_convertible_to_type.carbon index a38d1b026988..cf7d833f3dc5 100644 --- a/explorer/testdata/function/return_convertible_to_type.carbon +++ b/explorer/testdata/function/return_convertible_to_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/function/return_exhaustive_match.carbon b/explorer/testdata/function/return_exhaustive_match.carbon index 49928a01bc4e..dc5e8ff7d5fb 100644 --- a/explorer/testdata/function/return_exhaustive_match.carbon +++ b/explorer/testdata/function/return_exhaustive_match.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/function/type_match.carbon b/explorer/testdata/function/type_match.carbon index 018ab24a0209..113937a5a6d6 100644 --- a/explorer/testdata/function/type_match.carbon +++ b/explorer/testdata/function/type_match.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/class_function.carbon b/explorer/testdata/generic_class/class_function.carbon index 39c20996e7e1..ddbea4fdb629 100644 --- a/explorer/testdata/generic_class/class_function.carbon +++ b/explorer/testdata/generic_class/class_function.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/convert_from_struct.carbon b/explorer/testdata/generic_class/convert_from_struct.carbon index b696eb17efbc..6e6041fd390f 100644 --- a/explorer/testdata/generic_class/convert_from_struct.carbon +++ b/explorer/testdata/generic_class/convert_from_struct.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 5 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/fail_args_mismatch.carbon b/explorer/testdata/generic_class/fail_args_mismatch.carbon index 2eb70e24cf08..599c4efa4c0b 100644 --- a/explorer/testdata/generic_class/fail_args_mismatch.carbon +++ b/explorer/testdata/generic_class/fail_args_mismatch.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class Point(T:! type) { // Point(T, T) does not match class declaration - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_args_mismatch.carbon:[[@LINE+1]]: wrong number of arguments in function call, expected 1 but got 2 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_args_mismatch.carbon:[[@LINE+1]]: wrong number of arguments in function call, expected 1 but got 2 fn Origin(zero: T) -> Point(T, T) { return {.x = zero, .y = zero}; } diff --git a/explorer/testdata/generic_class/fail_argument_deduction.carbon b/explorer/testdata/generic_class/fail_argument_deduction.carbon index ac3db1872da3..6f5064742a59 100644 --- a/explorer/testdata/generic_class/fail_argument_deduction.carbon +++ b/explorer/testdata/generic_class/fail_argument_deduction.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -20,7 +18,7 @@ fn FirstOfTwoPoints[T:! type](a: Point(T), b: Point(T)) -> Point(T) { fn Main() -> i32 { var p: Point(i32) = {.x = 0, .y = 1}; var q: Point(bool) = {.x = true, .y = false}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_argument_deduction.carbon:[[@LINE+3]]: deduced multiple different values for T:! type: + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_argument_deduction.carbon:[[@LINE+3]]: deduced multiple different values for T:! type: // CHECK:STDERR: i32 // CHECK:STDERR: bool return FirstOfTwoPoints(p, q).x; diff --git a/explorer/testdata/generic_class/fail_bad_parameter_type.carbon b/explorer/testdata/generic_class/fail_bad_parameter_type.carbon index 2a41eb26ae36..f95ce5ec41d3 100644 --- a/explorer/testdata/generic_class/fail_bad_parameter_type.carbon +++ b/explorer/testdata/generic_class/fail_bad_parameter_type.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class Point(T:! i32) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_bad_parameter_type.carbon:[[@LINE+1]]: type error in type of name binding: 'i32' is not implicitly convertible to 'type' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_bad_parameter_type.carbon:[[@LINE+1]]: type error in type of name binding: 'i32' is not implicitly convertible to 'type' fn Origin(zero: T) -> Point(T) { return {.x = zero, .y = zero}; } diff --git a/explorer/testdata/generic_class/fail_field_access_on_generic.carbon b/explorer/testdata/generic_class/fail_field_access_on_generic.carbon index 4e54c72684f9..d3fda3ed2f6f 100644 --- a/explorer/testdata/generic_class/fail_field_access_on_generic.carbon +++ b/explorer/testdata/generic_class/fail_field_access_on_generic.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn BadSimpleMemberAccess[T:! type](a: T) -> T { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_field_access_on_generic.carbon:[[@LINE+1]]: member access in unconstrained type + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_field_access_on_generic.carbon:[[@LINE+1]]: member access in unconstrained type return a.x; } diff --git a/explorer/testdata/generic_class/fail_generic_class_arg.carbon b/explorer/testdata/generic_class/fail_generic_class_arg.carbon index 611ee65d05fb..ca1802b013e2 100644 --- a/explorer/testdata/generic_class/fail_generic_class_arg.carbon +++ b/explorer/testdata/generic_class/fail_generic_class_arg.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -18,7 +16,7 @@ class Point(T:! type) { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_generic_class_arg.carbon:[[@LINE+1]]: wrong number of arguments in function call, expected 1 but got 2 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_generic_class_arg.carbon:[[@LINE+1]]: wrong number of arguments in function call, expected 1 but got 2 var p: Point(i32) = Point(i32, i32).Create(0, 1); return p.x; } diff --git a/explorer/testdata/generic_class/fail_generic_in_pattern.carbon b/explorer/testdata/generic_class/fail_generic_in_pattern.carbon index 1ec56ecb4976..01bb30e13a3d 100644 --- a/explorer/testdata/generic_class/fail_generic_in_pattern.carbon +++ b/explorer/testdata/generic_class/fail_generic_in_pattern.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var t: auto = 5; match (t) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_generic_in_pattern.carbon:[[@LINE+1]]: generic binding may not occur in pattern with expected type T:! i32 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_generic_in_pattern.carbon:[[@LINE+1]]: generic binding may not occur in pattern with expected type T:! i32 case T:! i32 => { return 0; } default => { return 1; } } diff --git a/explorer/testdata/generic_class/fail_instantiate_non_generic.carbon b/explorer/testdata/generic_class/fail_instantiate_non_generic.carbon index d325921a5b1c..2076fcd34459 100644 --- a/explorer/testdata/generic_class/fail_instantiate_non_generic.carbon +++ b/explorer/testdata/generic_class/fail_instantiate_non_generic.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -17,7 +15,7 @@ class Point { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_instantiate_non_generic.carbon:[[@LINE+1]]: in call `Point(i32)`, expected callee to be a function, found `type` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_instantiate_non_generic.carbon:[[@LINE+1]]: in call `Point(i32)`, expected callee to be a function, found `type` var p: Point(i32) = Point.Origin(); return 0; } diff --git a/explorer/testdata/generic_class/fail_no_args.carbon b/explorer/testdata/generic_class/fail_no_args.carbon index ba089bd3d8c9..d4419cd240ef 100644 --- a/explorer/testdata/generic_class/fail_no_args.carbon +++ b/explorer/testdata/generic_class/fail_no_args.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ class Point(T:! type) { } // Error: wrote `Point` instead of `Point(T)`, `Point` by itself is not a type. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_no_args.carbon:[[@LINE+1]]: 'Point' must be given an argument list + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_no_args.carbon:[[@LINE+1]]: 'Point' must be given an argument list fn GetX[self: Point]() -> T { return self.x; } diff --git a/explorer/testdata/generic_class/fail_point_equal.carbon b/explorer/testdata/generic_class/fail_point_equal.carbon index f322cd7d1c6d..fa9a621bdcc8 100644 --- a/explorer/testdata/generic_class/fail_point_equal.carbon +++ b/explorer/testdata/generic_class/fail_point_equal.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,7 +13,7 @@ class Point(T:! type) { fn Main() -> i32 { var p: Point(i32) = {.x = 0, .y = 0}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_point_equal.carbon:[[@LINE+1]]: type error in initializer of variable: 'class Point(T = i32)' is not implicitly convertible to 'class Point(T = bool)' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_point_equal.carbon:[[@LINE+1]]: type error in initializer of variable: 'class Point(T = i32)' is not implicitly convertible to 'class Point(T = bool)' var q: Point(bool) = p; return 0; } diff --git a/explorer/testdata/generic_class/fail_return_type_is_type.carbon b/explorer/testdata/generic_class/fail_return_type_is_type.carbon index 127527c6c684..71219cc1fcfd 100644 --- a/explorer/testdata/generic_class/fail_return_type_is_type.carbon +++ b/explorer/testdata/generic_class/fail_return_type_is_type.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class Point(T:! type) { // The return type should be Point(T). Point by itself is not a type. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_return_type_is_type.carbon:[[@LINE+1]]: 'Point' must be given an argument list + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_return_type_is_type.carbon:[[@LINE+1]]: 'Point' must be given an argument list fn Create(x: T, y: T) -> Point { return {.x = x, .y = y}; } diff --git a/explorer/testdata/generic_class/fail_self_with_arg.carbon b/explorer/testdata/generic_class/fail_self_with_arg.carbon index 1c16b636738a..a03425a5619a 100644 --- a/explorer/testdata/generic_class/fail_self_with_arg.carbon +++ b/explorer/testdata/generic_class/fail_self_with_arg.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class Point(T:! type) { // Error: wrote `Self(T)` instead of `Self`. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_self_with_arg.carbon:[[@LINE+1]]: in call `Self(T)`, expected callee to be a function, found `type` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_self_with_arg.carbon:[[@LINE+1]]: in call `Self(T)`, expected callee to be a function, found `type` fn Origin(zero: T) -> Self(T) { return {.x = zero, .y = zero}; } diff --git a/explorer/testdata/generic_class/fail_two_arg_lists.carbon b/explorer/testdata/generic_class/fail_two_arg_lists.carbon index 79fbaa416cb0..3a493d8a0149 100644 --- a/explorer/testdata/generic_class/fail_two_arg_lists.carbon +++ b/explorer/testdata/generic_class/fail_two_arg_lists.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class Point(T:! type) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_two_arg_lists.carbon:[[@LINE+1]]: in call `Point(T)(T)`, expected callee to be a function, found `type` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_two_arg_lists.carbon:[[@LINE+1]]: in call `Point(T)(T)`, expected callee to be a function, found `type` fn Origin(zero: T) -> Point(T)(T) { return {.x = zero, .y = zero}; } diff --git a/explorer/testdata/generic_class/fail_value_param_mismatch.carbon b/explorer/testdata/generic_class/fail_value_param_mismatch.carbon index d081782c6846..2b1c4d083386 100644 --- a/explorer/testdata/generic_class/fail_value_param_mismatch.carbon +++ b/explorer/testdata/generic_class/fail_value_param_mismatch.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ fn F(x: HasI32Param(1)) {} fn Main() -> i32 { var n: HasI32Param(0) = {}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_value_param_mismatch.carbon:[[@LINE+1]]: mismatch in non-deduced values, `0` != `1` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_class/fail_value_param_mismatch.carbon:[[@LINE+1]]: mismatch in non-deduced values, `0` != `1` F(n); return 0; } diff --git a/explorer/testdata/generic_class/generic_class_substitution.carbon b/explorer/testdata/generic_class/generic_class_substitution.carbon index 42e97899c49e..fb44d1b5f40f 100644 --- a/explorer/testdata/generic_class/generic_class_substitution.carbon +++ b/explorer/testdata/generic_class/generic_class_substitution.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/generic_fun_and_class.carbon b/explorer/testdata/generic_class/generic_fun_and_class.carbon index 09afd7d407b2..0e14b70dbb02 100644 --- a/explorer/testdata/generic_class/generic_fun_and_class.carbon +++ b/explorer/testdata/generic_class/generic_fun_and_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/generic_point.carbon b/explorer/testdata/generic_class/generic_point.carbon index 47dea3c1dec5..206fba708b83 100644 --- a/explorer/testdata/generic_class/generic_point.carbon +++ b/explorer/testdata/generic_class/generic_point.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/impl_with_argument.carbon b/explorer/testdata/generic_class/impl_with_argument.carbon index 89f5c2e7d362..0d46ad68dc0a 100644 --- a/explorer/testdata/generic_class/impl_with_argument.carbon +++ b/explorer/testdata/generic_class/impl_with_argument.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/impl_with_self.carbon b/explorer/testdata/generic_class/impl_with_self.carbon index dabb3e393a4e..475491276586 100644 --- a/explorer/testdata/generic_class/impl_with_self.carbon +++ b/explorer/testdata/generic_class/impl_with_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/instantiation_at_compile_time.carbon b/explorer/testdata/generic_class/instantiation_at_compile_time.carbon index d1a11b450565..8441a4200d53 100644 --- a/explorer/testdata/generic_class/instantiation_at_compile_time.carbon +++ b/explorer/testdata/generic_class/instantiation_at_compile_time.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/param_with_dependent_type.carbon b/explorer/testdata/generic_class/param_with_dependent_type.carbon index 1b92916d03ba..5d5f7ac8242a 100644 --- a/explorer/testdata/generic_class/param_with_dependent_type.carbon +++ b/explorer/testdata/generic_class/param_with_dependent_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/parameter_type_conversion.carbon b/explorer/testdata/generic_class/parameter_type_conversion.carbon index 67b60971c7a4..3923a0003b7c 100644 --- a/explorer/testdata/generic_class/parameter_type_conversion.carbon +++ b/explorer/testdata/generic_class/parameter_type_conversion.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 4 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/point_with_interface.carbon b/explorer/testdata/generic_class/point_with_interface.carbon index 27dd4ce2c31e..8f8bfeaadfc1 100644 --- a/explorer/testdata/generic_class/point_with_interface.carbon +++ b/explorer/testdata/generic_class/point_with_interface.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/use_at_compile_time.carbon b/explorer/testdata/generic_class/use_at_compile_time.carbon index 21477fb26d51..76b4f3c180a2 100644 --- a/explorer/testdata/generic_class/use_at_compile_time.carbon +++ b/explorer/testdata/generic_class/use_at_compile_time.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_class/use_self.carbon b/explorer/testdata/generic_class/use_self.carbon index 7bc1584bc719..c006d8160279 100644 --- a/explorer/testdata/generic_class/use_self.carbon +++ b/explorer/testdata/generic_class/use_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_function/apply.carbon b/explorer/testdata/generic_function/apply.carbon index b7634d0aff14..42ca0afa4df2 100644 --- a/explorer/testdata/generic_function/apply.carbon +++ b/explorer/testdata/generic_function/apply.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: -2 package ExplorerTest api; diff --git a/explorer/testdata/generic_function/call_at_compile_time.carbon b/explorer/testdata/generic_function/call_at_compile_time.carbon index ea3cdeae89a5..29428f43db77 100644 --- a/explorer/testdata/generic_function/call_at_compile_time.carbon +++ b/explorer/testdata/generic_function/call_at_compile_time.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_function/fail_implicit_conversion_extra_field.carbon b/explorer/testdata/generic_function/fail_implicit_conversion_extra_field.carbon index 08b146f26a97..249bfcdb8fd3 100644 --- a/explorer/testdata/generic_function/fail_implicit_conversion_extra_field.carbon +++ b/explorer/testdata/generic_function/fail_implicit_conversion_extra_field.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Bad[T:! type](x: {.a: i32, .b: T}) {} fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_function/fail_implicit_conversion_extra_field.carbon:[[@LINE+1]]: mismatch in field names, source field `c` not in destination type `{.a: i32, .b: T}` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_function/fail_implicit_conversion_extra_field.carbon:[[@LINE+1]]: mismatch in field names, source field `c` not in destination type `{.a: i32, .b: T}` Bad({.b = 5, .a = 7, .c = 2}); return 0; } diff --git a/explorer/testdata/generic_function/fail_implicit_conversion_missing_field.carbon b/explorer/testdata/generic_function/fail_implicit_conversion_missing_field.carbon index 82f139700e05..1798bd3419ec 100644 --- a/explorer/testdata/generic_function/fail_implicit_conversion_missing_field.carbon +++ b/explorer/testdata/generic_function/fail_implicit_conversion_missing_field.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Bad[T:! type](x: {.a: i32, .b: T}) {} fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_function/fail_implicit_conversion_missing_field.carbon:[[@LINE+1]]: mismatch in field names, destination field `b` not in source type `{.a: i32}` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_function/fail_implicit_conversion_missing_field.carbon:[[@LINE+1]]: mismatch in field names, destination field `b` not in source type `{.a: i32}` Bad({.a = 5}); return 0; } diff --git a/explorer/testdata/generic_function/fail_missing_exclam.carbon b/explorer/testdata/generic_function/fail_missing_exclam.carbon index 3e3ba1867c41..11e8d3651cc0 100644 --- a/explorer/testdata/generic_function/fail_missing_exclam.carbon +++ b/explorer/testdata/generic_function/fail_missing_exclam.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/generic_function/fail_missing_exclam.carbon:[[@LINE+1]]: illegal binding pattern in implicit parameter list +// CHECK:STDERR: SYNTAX ERROR: explorer/testdata/generic_function/fail_missing_exclam.carbon:[[@LINE+1]]: illegal binding pattern in implicit parameter list fn F[T: type](); fn Main() -> i32 { diff --git a/explorer/testdata/generic_function/fail_not_addable.carbon b/explorer/testdata/generic_function/fail_not_addable.carbon index 2a9214cb3262..d9515e38503f 100644 --- a/explorer/testdata/generic_function/fail_not_addable.carbon +++ b/explorer/testdata/generic_function/fail_not_addable.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn id[T:! type](x: T) -> T { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_function/fail_not_addable.carbon:[[@LINE+2]]: type error in `+`: + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_function/fail_not_addable.carbon:[[@LINE+2]]: type error in `+`: // CHECK:STDERR: could not find implementation of interface AddWith(U = i32) for T return x + 0; } diff --git a/explorer/testdata/generic_function/fail_not_type.carbon b/explorer/testdata/generic_function/fail_not_type.carbon index 470c430ba200..ba960c7e0f3b 100644 --- a/explorer/testdata/generic_function/fail_not_type.carbon +++ b/explorer/testdata/generic_function/fail_not_type.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_function/fail_not_type.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_function/fail_not_type.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' fn F[a:! 42](); fn Main() -> i32 { diff --git a/explorer/testdata/generic_function/fail_type_deduction_mismatch.carbon b/explorer/testdata/generic_function/fail_type_deduction_mismatch.carbon index ce84d4b904ca..3d7bc6f626ea 100644 --- a/explorer/testdata/generic_function/fail_type_deduction_mismatch.carbon +++ b/explorer/testdata/generic_function/fail_type_deduction_mismatch.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ fn fst[T:! type](x: T, y: T) -> T { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_function/fail_type_deduction_mismatch.carbon:[[@LINE+3]]: deduced multiple different values for T:! type: + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_function/fail_type_deduction_mismatch.carbon:[[@LINE+3]]: deduced multiple different values for T:! type: // CHECK:STDERR: i32 // CHECK:STDERR: bool return fst(0, true); diff --git a/explorer/testdata/generic_function/fail_type_deduction_unused.carbon b/explorer/testdata/generic_function/fail_type_deduction_unused.carbon index 9a1d3bd56b59..8ee375c787b5 100644 --- a/explorer/testdata/generic_function/fail_type_deduction_unused.carbon +++ b/explorer/testdata/generic_function/fail_type_deduction_unused.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,6 +11,6 @@ fn id[T:! type](x: i32) -> i32 { } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_function/fail_type_deduction_unused.carbon:[[@LINE+1]]: could not deduce type argument for type parameter T in call + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_function/fail_type_deduction_unused.carbon:[[@LINE+1]]: could not deduce type argument for type parameter T in call return id(0); } diff --git a/explorer/testdata/generic_function/fail_type_only.carbon b/explorer/testdata/generic_function/fail_type_only.carbon index 3515d2f38805..d468428c6482 100644 --- a/explorer/testdata/generic_function/fail_type_only.carbon +++ b/explorer/testdata/generic_function/fail_type_only.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class C {} -// CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/generic_function/fail_type_only.carbon:[[@LINE+1]]: syntax error, unexpected RIGHT_SQUARE_BRACKET, expecting COLON +// CHECK:STDERR: SYNTAX ERROR: explorer/testdata/generic_function/fail_type_only.carbon:[[@LINE+1]]: syntax error, unexpected RIGHT_SQUARE_BRACKET, expecting COLON fn f[x:! i32, addr C]() {} fn Main() -> i32 { diff --git a/explorer/testdata/generic_function/fail_wrong_variable_substituation.carbon b/explorer/testdata/generic_function/fail_wrong_variable_substituation.carbon index bc26ad198566..c523b1cc70b9 100644 --- a/explorer/testdata/generic_function/fail_wrong_variable_substituation.carbon +++ b/explorer/testdata/generic_function/fail_wrong_variable_substituation.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package Foo api; @@ -15,7 +13,7 @@ fn Get[T:! ()](n: T) -> i32 { return 2; } fn Main() -> i32 { var x : X = {}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_function/fail_wrong_variable_substituation.carbon:[[@LINE+1]]: cannot convert deduced value class X for T to parameter type () + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/generic_function/fail_wrong_variable_substituation.carbon:[[@LINE+1]]: cannot convert deduced value class X for T to parameter type () Get(x); return 0; } diff --git a/explorer/testdata/generic_function/generic_method.carbon b/explorer/testdata/generic_function/generic_method.carbon index 8a64f70e1a43..d75d37421ed7 100644 --- a/explorer/testdata/generic_function/generic_method.carbon +++ b/explorer/testdata/generic_function/generic_method.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_function/implicit_conversion.carbon b/explorer/testdata/generic_function/implicit_conversion.carbon index e907463d71e1..2c0cd7a99a07 100644 --- a/explorer/testdata/generic_function/implicit_conversion.carbon +++ b/explorer/testdata/generic_function/implicit_conversion.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 4213 package ExplorerTest api; diff --git a/explorer/testdata/generic_function/instantiate_deduced.carbon b/explorer/testdata/generic_function/instantiate_deduced.carbon index cf36bddb5f0f..34d71a7caeea 100644 --- a/explorer/testdata/generic_function/instantiate_deduced.carbon +++ b/explorer/testdata/generic_function/instantiate_deduced.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_function/non_generic_param.carbon b/explorer/testdata/generic_function/non_generic_param.carbon index 4d69146a7e47..9f8460dd6527 100644 --- a/explorer/testdata/generic_function/non_generic_param.carbon +++ b/explorer/testdata/generic_function/non_generic_param.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/generic_function/nondeduced_generic_param.carbon b/explorer/testdata/generic_function/nondeduced_generic_param.carbon index 90e2399d7fd7..068365f7c1e1 100644 --- a/explorer/testdata/generic_function/nondeduced_generic_param.carbon +++ b/explorer/testdata/generic_function/nondeduced_generic_param.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/generic_function/return_val.carbon b/explorer/testdata/generic_function/return_val.carbon index a4dfab704012..a1977a058699 100644 --- a/explorer/testdata/generic_function/return_val.carbon +++ b/explorer/testdata/generic_function/return_val.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_function/swap.carbon b/explorer/testdata/generic_function/swap.carbon index 3dd7e7961011..50a5de9585a1 100644 --- a/explorer/testdata/generic_function/swap.carbon +++ b/explorer/testdata/generic_function/swap.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/generic_function/tuple_map.carbon b/explorer/testdata/generic_function/tuple_map.carbon index 5b92d1aced23..d25ef02db91a 100644 --- a/explorer/testdata/generic_function/tuple_map.carbon +++ b/explorer/testdata/generic_function/tuple_map.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/generic_function/type_matching.carbon b/explorer/testdata/generic_function/type_matching.carbon index 48ad8765d003..f0faf2e26524 100644 --- a/explorer/testdata/generic_function/type_matching.carbon +++ b/explorer/testdata/generic_function/type_matching.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/if_else/convert_condition.carbon b/explorer/testdata/if_else/convert_condition.carbon index 7ab2bfa6feb2..1d404ea5e91c 100644 --- a/explorer/testdata/if_else/convert_condition.carbon +++ b/explorer/testdata/if_else/convert_condition.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/if_else/if_else.carbon b/explorer/testdata/if_else/if_else.carbon index 8c6f1d1e2880..7eb4a0c1df7b 100644 --- a/explorer/testdata/if_else/if_else.carbon +++ b/explorer/testdata/if_else/if_else.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/if_else/if_else_if.carbon b/explorer/testdata/if_else/if_else_if.carbon index 35520e1124db..5535e4c6a276 100644 --- a/explorer/testdata/if_else/if_else_if.carbon +++ b/explorer/testdata/if_else/if_else_if.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/if_else/if_else_if_else.carbon b/explorer/testdata/if_else/if_else_if_else.carbon index 2697a9c9641f..c7cd388898a5 100644 --- a/explorer/testdata/if_else/if_else_if_else.carbon +++ b/explorer/testdata/if_else/if_else_if_else.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/if_else/if_false.carbon b/explorer/testdata/if_else/if_false.carbon index a78617067e2c..3d51f9b42bf9 100644 --- a/explorer/testdata/if_else/if_false.carbon +++ b/explorer/testdata/if_else/if_false.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/if_else/if_nesting.carbon b/explorer/testdata/if_else/if_nesting.carbon index 09c7c5710b42..3a0ac6346ad5 100644 --- a/explorer/testdata/if_else/if_nesting.carbon +++ b/explorer/testdata/if_else/if_nesting.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/if_else/if_true.carbon b/explorer/testdata/if_else/if_true.carbon index 738d35240f0c..bf3b31ee5fb5 100644 --- a/explorer/testdata/if_else/if_true.carbon +++ b/explorer/testdata/if_else/if_true.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/if_expression/convert_condition.carbon b/explorer/testdata/if_expression/convert_condition.carbon index a42474b70487..0cba534605b0 100644 --- a/explorer/testdata/if_expression/convert_condition.carbon +++ b/explorer/testdata/if_expression/convert_condition.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/if_expression/if_then_else.carbon b/explorer/testdata/if_expression/if_then_else.carbon index 8b6d103543e9..13f0b6f496c7 100644 --- a/explorer/testdata/if_expression/if_then_else.carbon +++ b/explorer/testdata/if_expression/if_then_else.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 12 package ExplorerTest api; diff --git a/explorer/testdata/impl/deducible_parameter.carbon b/explorer/testdata/impl/deducible_parameter.carbon index 54b338b4280c..aa4f891e8e92 100644 --- a/explorer/testdata/impl/deducible_parameter.carbon +++ b/explorer/testdata/impl/deducible_parameter.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/impl/fail_bad_member_kind.carbon b/explorer/testdata/impl/fail_bad_member_kind.carbon index b9698d2bfb1e..b3eb0b6df813 100644 --- a/explorer/testdata/impl/fail_bad_member_kind.carbon +++ b/explorer/testdata/impl/fail_bad_member_kind.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ interface A { } external impl i32 as A { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/impl/fail_bad_member_kind.carbon:[[@LINE+1]]: syntax error, unexpected CLASS + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/impl/fail_bad_member_kind.carbon:[[@LINE+1]]: syntax error, unexpected CLASS class T {} } diff --git a/explorer/testdata/impl/fail_impl_as.carbon b/explorer/testdata/impl/fail_impl_as.carbon index 87aead878dba..a7f2c02f7302 100644 --- a/explorer/testdata/impl/fail_impl_as.carbon +++ b/explorer/testdata/impl/fail_impl_as.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl/fail_impl_as.carbon:[[@LINE+1]]: expected a constraint in impl declaration, found i32 +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_impl_as.carbon:[[@LINE+1]]: expected a constraint in impl declaration, found i32 external impl i32 as i32 {} fn Main() -> i32 { diff --git a/explorer/testdata/impl/fail_impl_as_non_interface.carbon b/explorer/testdata/impl/fail_impl_as_non_interface.carbon index e7ceaba68323..dcf299b735d2 100644 --- a/explorer/testdata/impl/fail_impl_as_non_interface.carbon +++ b/explorer/testdata/impl/fail_impl_as_non_interface.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl/fail_impl_as_non_interface.carbon:[[@LINE+1]]: expected a constraint in impl declaration, found String +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_impl_as_non_interface.carbon:[[@LINE+1]]: expected a constraint in impl declaration, found String external impl i32 as String {} fn Main() -> i32 { diff --git a/explorer/testdata/impl/fail_impl_as_not_constraint.carbon b/explorer/testdata/impl/fail_impl_as_not_constraint.carbon index 2ae73af4fd21..ea3f6d9cfaac 100644 --- a/explorer/testdata/impl/fail_impl_as_not_constraint.carbon +++ b/explorer/testdata/impl/fail_impl_as_not_constraint.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl/fail_impl_as_not_constraint.carbon:[[@LINE+1]]: expected a constraint in impl declaration, found i32 +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_impl_as_not_constraint.carbon:[[@LINE+1]]: expected a constraint in impl declaration, found i32 external impl i32 as i32 {} fn Main() -> i32 { diff --git a/explorer/testdata/impl/fail_impl_as_parameterized.carbon b/explorer/testdata/impl/fail_impl_as_parameterized.carbon index c2b71410d8f3..c98b3ef6d288 100644 --- a/explorer/testdata/impl/fail_impl_as_parameterized.carbon +++ b/explorer/testdata/impl/fail_impl_as_parameterized.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface Vector(Scalar:! type) { } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl/fail_impl_as_parameterized.carbon:[[@LINE+1]]: 'Vector' must be given an argument list +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_impl_as_parameterized.carbon:[[@LINE+1]]: 'Vector' must be given an argument list external impl i32 as Vector {} fn Main() -> i32 { diff --git a/explorer/testdata/impl/fail_impl_redefinition.carbon b/explorer/testdata/impl/fail_impl_redefinition.carbon index a15a734047e9..4c7f4050d0d2 100644 --- a/explorer/testdata/impl/fail_impl_redefinition.carbon +++ b/explorer/testdata/impl/fail_impl_redefinition.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -35,7 +33,7 @@ external impl Point as Vector { fn Scale[self: Point](v: i32) -> Point { return {.x = self.x * v, .y = self.y * v}; } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl/fail_impl_redefinition.carbon:[[@LINE+1]]: ambiguous implementations of interface Vector for class Point +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_impl_redefinition.carbon:[[@LINE+1]]: ambiguous implementations of interface Vector for class Point } fn AddAndScaleGeneric[T:! Vector](a: T, b: T, s: i32) -> T { diff --git a/explorer/testdata/impl/fail_nondeducible_parameter.carbon b/explorer/testdata/impl/fail_nondeducible_parameter.carbon index 60d8b9a52b4c..4b7f1f6889ae 100644 --- a/explorer/testdata/impl/fail_nondeducible_parameter.carbon +++ b/explorer/testdata/impl/fail_nondeducible_parameter.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface A(T:! type) {} interface B {} -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl/fail_nondeducible_parameter.carbon:[[@LINE+1]]: parameter `T:! type` is not deducible from `impl i32 as interface B` +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_nondeducible_parameter.carbon:[[@LINE+1]]: parameter `T:! type` is not deducible from `impl i32 as interface B` external impl forall [T:! type] i32 as A(T) & B {} fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/impl/fail_param_interface_in_impl.carbon b/explorer/testdata/impl/fail_param_interface_in_impl.carbon index 060ef0a3b2d1..322fc1bd3ed8 100644 --- a/explorer/testdata/impl/fail_param_interface_in_impl.carbon +++ b/explorer/testdata/impl/fail_param_interface_in_impl.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,7 +17,7 @@ fn Main() -> i32 { let n: i32 = 0; CheckSimilar(true, false); CheckSimilar(true, n); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl/fail_param_interface_in_impl.carbon:[[@LINE+1]]: could not find implementation of interface Similar(T = i32) for bool + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_param_interface_in_impl.carbon:[[@LINE+1]]: could not find implementation of interface Similar(T = i32) for bool CheckSimilar(n, false); return 0; } diff --git a/explorer/testdata/impl/fail_unmet_impls_constraint.carbon b/explorer/testdata/impl/fail_unmet_impls_constraint.carbon index 75b7947b2539..a12877176063 100644 --- a/explorer/testdata/impl/fail_unmet_impls_constraint.carbon +++ b/explorer/testdata/impl/fail_unmet_impls_constraint.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface A {} interface B {} -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl/fail_unmet_impls_constraint.carbon:[[@LINE+1]]: could not find implementation of interface B for i32 +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_unmet_impls_constraint.carbon:[[@LINE+1]]: could not find implementation of interface B for i32 external impl i32 as A where i32 impls B {} fn Main() -> i32 { diff --git a/explorer/testdata/impl/generic_method_impl.carbon b/explorer/testdata/impl/generic_method_impl.carbon index 0af8d87d34aa..91325ed4b3c8 100644 --- a/explorer/testdata/impl/generic_method_impl.carbon +++ b/explorer/testdata/impl/generic_method_impl.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/impl/impl_in_generic_class.carbon b/explorer/testdata/impl/impl_in_generic_class.carbon index 177e4c534a3a..80264c6d66aa 100644 --- a/explorer/testdata/impl/impl_in_generic_class.carbon +++ b/explorer/testdata/impl/impl_in_generic_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1133 package ExplorerTest api; diff --git a/explorer/testdata/impl/impls_constraint.carbon b/explorer/testdata/impl/impls_constraint.carbon index 0fbedf6bba22..4ee7ef54b1bc 100644 --- a/explorer/testdata/impl/impls_constraint.carbon +++ b/explorer/testdata/impl/impls_constraint.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1234 package ExplorerTest api; diff --git a/explorer/testdata/impl/param_impl.carbon b/explorer/testdata/impl/param_impl.carbon index d5ae9e9dad91..4a453832b799 100644 --- a/explorer/testdata/impl/param_impl.carbon +++ b/explorer/testdata/impl/param_impl.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/impl/param_impl2.carbon b/explorer/testdata/impl/param_impl2.carbon index 5ec1e8e79a8a..0352a7fc4a58 100644 --- a/explorer/testdata/impl/param_impl2.carbon +++ b/explorer/testdata/impl/param_impl2.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/impl/param_impl_with_self.carbon b/explorer/testdata/impl/param_impl_with_self.carbon index 4350a5277847..8c9caa4c5726 100644 --- a/explorer/testdata/impl/param_impl_with_self.carbon +++ b/explorer/testdata/impl/param_impl_with_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/impl/param_interface_in_impl.carbon b/explorer/testdata/impl/param_interface_in_impl.carbon index ca118e501b2a..f454b6323254 100644 --- a/explorer/testdata/impl/param_interface_in_impl.carbon +++ b/explorer/testdata/impl/param_interface_in_impl.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/impl/struct.carbon b/explorer/testdata/impl/struct.carbon index a51989f888a1..6369363bdba3 100644 --- a/explorer/testdata/impl/struct.carbon +++ b/explorer/testdata/impl/struct.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/impl_match/build_tree.carbon b/explorer/testdata/impl_match/build_tree.carbon index 93c30c3b297a..455bd1c49743 100644 --- a/explorer/testdata/impl_match/build_tree.carbon +++ b/explorer/testdata/impl_match/build_tree.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/impl_match/fail_self_recurse.carbon b/explorer/testdata/impl_match/fail_self_recurse.carbon index dc0d69f7ffaf..b2ab885243cd 100644 --- a/explorer/testdata/impl_match/fail_self_recurse.carbon +++ b/explorer/testdata/impl_match/fail_self_recurse.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,7 +13,7 @@ impl forall [T:! type where .Self* impls Foo] T as Foo {} fn F[T:! Foo](x: T) {} fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl_match/fail_self_recurse.carbon:[[@LINE+3]]: impl matching recursively performed a more complex match using the same impl + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl_match/fail_self_recurse.carbon:[[@LINE+3]]: impl matching recursively performed a more complex match using the same impl // CHECK:STDERR: outer match: i32 as interface Foo // CHECK:STDERR: inner match: i32* as interface Foo F(0); diff --git a/explorer/testdata/impl_match/fail_self_recurse_without_match_first.carbon b/explorer/testdata/impl_match/fail_self_recurse_without_match_first.carbon index 2b6bbe384ab7..6c1b51317927 100644 --- a/explorer/testdata/impl_match/fail_self_recurse_without_match_first.carbon +++ b/explorer/testdata/impl_match/fail_self_recurse_without_match_first.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,7 +17,7 @@ fn Main() -> i32 { // When checking the second impl, we recursively look for a match for // i32* as Foo, which considers the second impl again, even though the first // impl would match. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl_match/fail_self_recurse_without_match_first.carbon:[[@LINE+3]]: impl matching recursively performed a more complex match using the same impl + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl_match/fail_self_recurse_without_match_first.carbon:[[@LINE+3]]: impl matching recursively performed a more complex match using the same impl // CHECK:STDERR: outer match: i32 as interface Foo // CHECK:STDERR: inner match: i32* as interface Foo F(0); diff --git a/explorer/testdata/impl_match/fail_simple_self_recurse.carbon b/explorer/testdata/impl_match/fail_simple_self_recurse.carbon index 4775e8facbae..b7c0e1e73680 100644 --- a/explorer/testdata/impl_match/fail_simple_self_recurse.carbon +++ b/explorer/testdata/impl_match/fail_simple_self_recurse.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,7 +13,7 @@ impl forall [T:! Foo] T as Foo {} fn F[T:! Foo](x: T) {} fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl_match/fail_simple_self_recurse.carbon:[[@LINE+1]]: impl matching for i32 as interface Foo recursively performed a match for the same type and interface + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl_match/fail_simple_self_recurse.carbon:[[@LINE+1]]: impl matching for i32 as interface Foo recursively performed a match for the same type and interface F(0); return 0; } diff --git a/explorer/testdata/impl_match/fail_struct_recurse.carbon b/explorer/testdata/impl_match/fail_struct_recurse.carbon index 052b1f20c571..57bdb1d31813 100644 --- a/explorer/testdata/impl_match/fail_struct_recurse.carbon +++ b/explorer/testdata/impl_match/fail_struct_recurse.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,7 +13,7 @@ impl forall [T:! type where {.a: .Self} impls Foo] T as Foo {} fn F[T:! Foo](x: T) {} fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl_match/fail_struct_recurse.carbon:[[@LINE+3]]: impl matching recursively performed a more complex match using the same impl + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl_match/fail_struct_recurse.carbon:[[@LINE+3]]: impl matching recursively performed a more complex match using the same impl // CHECK:STDERR: outer match: i32 as interface Foo // CHECK:STDERR: inner match: {.a: i32} as interface Foo F(0); diff --git a/explorer/testdata/impl_match/fail_three_step_recurse.carbon b/explorer/testdata/impl_match/fail_three_step_recurse.carbon index 392e3056d0c0..b24ce9aa60dc 100644 --- a/explorer/testdata/impl_match/fail_three_step_recurse.carbon +++ b/explorer/testdata/impl_match/fail_three_step_recurse.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,7 +17,7 @@ impl forall [T:! type where .Self* impls C] T as A {} fn F[T:! A](x: T) {} fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl_match/fail_three_step_recurse.carbon:[[@LINE+3]]: impl matching recursively performed a more complex match using the same impl + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl_match/fail_three_step_recurse.carbon:[[@LINE+3]]: impl matching recursively performed a more complex match using the same impl // CHECK:STDERR: outer match: i32 as interface A // CHECK:STDERR: inner match: i32*** as interface A F(0); diff --git a/explorer/testdata/impl_match/fail_tuple_recurse.carbon b/explorer/testdata/impl_match/fail_tuple_recurse.carbon index d822706dc3bd..f8c6658d5f2f 100644 --- a/explorer/testdata/impl_match/fail_tuple_recurse.carbon +++ b/explorer/testdata/impl_match/fail_tuple_recurse.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,7 +13,7 @@ impl forall [T:! type where (.Self,) impls Foo] T as Foo {} fn F[T:! Foo](x: T) {} fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl_match/fail_tuple_recurse.carbon:[[@LINE+3]]: impl matching recursively performed a more complex match using the same impl + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl_match/fail_tuple_recurse.carbon:[[@LINE+3]]: impl matching recursively performed a more complex match using the same impl // CHECK:STDERR: outer match: i32 as interface Foo // CHECK:STDERR: inner match: (i32,) as interface Foo F(0); diff --git a/explorer/testdata/impl_match/match_first.carbon b/explorer/testdata/impl_match/match_first.carbon index 0d8bfd2fb713..f1391499a046 100644 --- a/explorer/testdata/impl_match/match_first.carbon +++ b/explorer/testdata/impl_match/match_first.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: XYZ: 1 // CHECK:STDOUT: XY: 1 // CHECK:STDOUT: XZ: 1 diff --git a/explorer/testdata/impl_match/self_recurse_with_match.carbon b/explorer/testdata/impl_match/self_recurse_with_match.carbon index a56e45319ec6..6033884282ed 100644 --- a/explorer/testdata/impl_match/self_recurse_with_match.carbon +++ b/explorer/testdata/impl_match/self_recurse_with_match.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/impl_match/self_recurse_with_match_first.carbon b/explorer/testdata/impl_match/self_recurse_with_match_first.carbon index 8b1b4773e61c..001856d59c2c 100644 --- a/explorer/testdata/impl_match/self_recurse_with_match_first.carbon +++ b/explorer/testdata/impl_match/self_recurse_with_match_first.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/impl_match/specialization.carbon b/explorer/testdata/impl_match/specialization.carbon index 275d594257a8..6c6a75e64d60 100644 --- a/explorer/testdata/impl_match/specialization.carbon +++ b/explorer/testdata/impl_match/specialization.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/impl_match/type_structure_bindings.carbon b/explorer/testdata/impl_match/type_structure_bindings.carbon index 47a7f73b587e..4b989b91d582 100644 --- a/explorer/testdata/impl_match/type_structure_bindings.carbon +++ b/explorer/testdata/impl_match/type_structure_bindings.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 1 // CHECK:STDOUT: 2 // CHECK:STDOUT: 3 diff --git a/explorer/testdata/impl_match/type_structure_order.carbon b/explorer/testdata/impl_match/type_structure_order.carbon index 181597297512..b6404ade4512 100644 --- a/explorer/testdata/impl_match/type_structure_order.carbon +++ b/explorer/testdata/impl_match/type_structure_order.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: A(T) as B(i32) // CHECK:STDOUT: A(T) as B(U) // CHECK:STDOUT: A(i32) as B(T) diff --git a/explorer/testdata/impl_match/type_structure_vs_match_first.carbon b/explorer/testdata/impl_match/type_structure_vs_match_first.carbon index 51955dafcae3..6d65ee99e337 100644 --- a/explorer/testdata/impl_match/type_structure_vs_match_first.carbon +++ b/explorer/testdata/impl_match/type_structure_vs_match_first.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: A(T) as B(i32) // CHECK:STDOUT: A(T) as B(U) // CHECK:STDOUT: A(i32) as B(T) diff --git a/explorer/testdata/import/fail_order.carbon b/explorer/testdata/import/fail_order.carbon index 42126d028213..26048ce057d9 100644 --- a/explorer/testdata/import/fail_order.carbon +++ b/explorer/testdata/import/fail_order.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,5 +10,5 @@ fn Main() -> i32 { return 0; } -// CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/import/fail_order.carbon:[[@LINE+1]]: syntax error, unexpected IMPORT, expecting END_OF_FILE +// CHECK:STDERR: SYNTAX ERROR: explorer/testdata/import/fail_order.carbon:[[@LINE+1]]: syntax error, unexpected IMPORT, expecting END_OF_FILE import ExplorerTest library "Nonexistent"; diff --git a/explorer/testdata/import/nonexistent_library.carbon b/explorer/testdata/import/nonexistent_library.carbon index beb390f3292d..77ccee3f0b46 100644 --- a/explorer/testdata/import/nonexistent_library.carbon +++ b/explorer/testdata/import/nonexistent_library.carbon @@ -5,8 +5,6 @@ // TODO: This SHOULD fail but doesn't presently. // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/import/nonexistent_package.carbon b/explorer/testdata/import/nonexistent_package.carbon index afd53e6a9ea3..9a905a6e6b44 100644 --- a/explorer/testdata/import/nonexistent_package.carbon +++ b/explorer/testdata/import/nonexistent_package.carbon @@ -5,8 +5,6 @@ // TODO: This SHOULD fail but doesn't presently. // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/addr_self.carbon b/explorer/testdata/interface/addr_self.carbon index d1bbe23705ec..2dc9c25cb1f8 100644 --- a/explorer/testdata/interface/addr_self.carbon +++ b/explorer/testdata/interface/addr_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 75 // CHECK:STDOUT: 100 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/interface/assoc_constant_constraints_in_scope.carbon b/explorer/testdata/interface/assoc_constant_constraints_in_scope.carbon index 8097d50ba0b9..24d77f034199 100644 --- a/explorer/testdata/interface/assoc_constant_constraints_in_scope.carbon +++ b/explorer/testdata/interface/assoc_constant_constraints_in_scope.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 5 package ExplorerTest api; diff --git a/explorer/testdata/interface/class_function.carbon b/explorer/testdata/interface/class_function.carbon index e101134911b7..94e75093b92a 100644 --- a/explorer/testdata/interface/class_function.carbon +++ b/explorer/testdata/interface/class_function.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/constrained_parameter.carbon b/explorer/testdata/interface/constrained_parameter.carbon index b821478b2844..d8b40a33318f 100644 --- a/explorer/testdata/interface/constrained_parameter.carbon +++ b/explorer/testdata/interface/constrained_parameter.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/extends.carbon b/explorer/testdata/interface/extends.carbon index f797102fdab3..79cfaa4f8f12 100644 --- a/explorer/testdata/interface/extends.carbon +++ b/explorer/testdata/interface/extends.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Carrot.G // CHECK:STDOUT: result: 5 diff --git a/explorer/testdata/interface/external_impl_point_vector.carbon b/explorer/testdata/interface/external_impl_point_vector.carbon index 087b39fcaca8..835b22edbe4b 100644 --- a/explorer/testdata/interface/external_impl_point_vector.carbon +++ b/explorer/testdata/interface/external_impl_point_vector.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/external_impl_use_self.carbon b/explorer/testdata/interface/external_impl_use_self.carbon index 376b0247362c..9d04bc5375c1 100644 --- a/explorer/testdata/interface/external_impl_use_self.carbon +++ b/explorer/testdata/interface/external_impl_use_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/fail_bad_member_kind.carbon b/explorer/testdata/interface/fail_bad_member_kind.carbon index 395d41cab456..ccc008d80aae 100644 --- a/explorer/testdata/interface/fail_bad_member_kind.carbon +++ b/explorer/testdata/interface/fail_bad_member_kind.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface Bad { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/interface/fail_bad_member_kind.carbon:[[@LINE+1]]: syntax error, unexpected VAR + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/interface/fail_bad_member_kind.carbon:[[@LINE+1]]: syntax error, unexpected VAR var V: i32; } diff --git a/explorer/testdata/interface/fail_extends_not_constraint.carbon b/explorer/testdata/interface/fail_extends_not_constraint.carbon index f3b5aa45ae4d..1ea0c7cebd21 100644 --- a/explorer/testdata/interface/fail_extends_not_constraint.carbon +++ b/explorer/testdata/interface/fail_extends_not_constraint.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface Vector { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_extends_not_constraint.carbon:[[@LINE+1]]: expected a constraint in extends declaration, found i32 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_extends_not_constraint.carbon:[[@LINE+1]]: expected a constraint in extends declaration, found i32 extends i32; } diff --git a/explorer/testdata/interface/fail_external_impl_omit_self.carbon b/explorer/testdata/interface/fail_external_impl_omit_self.carbon index ea5873b2490d..709979a51604 100644 --- a/explorer/testdata/interface/fail_external_impl_omit_self.carbon +++ b/explorer/testdata/interface/fail_external_impl_omit_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,7 +17,7 @@ class Point { } // Error: need to specify which type implementing `Vector` for. -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_external_impl_omit_self.carbon:[[@LINE+1]]: could not resolve 'Self' +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_external_impl_omit_self.carbon:[[@LINE+1]]: could not resolve 'Self' external impl as Vector { fn Add[self: Point](b: Point) -> Point { return {.x = self.x + b.x, .y = self.y + b.y}; diff --git a/explorer/testdata/interface/fail_external_impl_self.carbon b/explorer/testdata/interface/fail_external_impl_self.carbon index 7cc5ce1bfbbf..c71f4745ab53 100644 --- a/explorer/testdata/interface/fail_external_impl_self.carbon +++ b/explorer/testdata/interface/fail_external_impl_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -18,7 +16,7 @@ class Point { var y: i32; } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_external_impl_self.carbon:[[@LINE+1]]: could not resolve 'Self' +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_external_impl_self.carbon:[[@LINE+1]]: could not resolve 'Self' external impl Self as Vector { fn Add[self: Point](b: Point) -> Point { return {.x = self.x + b.x, .y = self.y + b.y}; diff --git a/explorer/testdata/interface/fail_impl_as_not_constraint.carbon b/explorer/testdata/interface/fail_impl_as_not_constraint.carbon index e4b5980b9670..f756615fcc27 100644 --- a/explorer/testdata/interface/fail_impl_as_not_constraint.carbon +++ b/explorer/testdata/interface/fail_impl_as_not_constraint.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface Vector { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_impl_as_not_constraint.carbon:[[@LINE+1]]: expected a constraint in impl as declaration, found i32 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_impl_as_not_constraint.carbon:[[@LINE+1]]: expected a constraint in impl as declaration, found i32 impl Self as i32; } diff --git a/explorer/testdata/interface/fail_impl_as_not_type.carbon b/explorer/testdata/interface/fail_impl_as_not_type.carbon index f06ddbd77645..c78ca4c9851d 100644 --- a/explorer/testdata/interface/fail_impl_as_not_type.carbon +++ b/explorer/testdata/interface/fail_impl_as_not_type.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface A {} interface B { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_impl_as_not_type.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_impl_as_not_type.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type' impl 5 as A; } diff --git a/explorer/testdata/interface/fail_impl_bad_member.carbon b/explorer/testdata/interface/fail_impl_bad_member.carbon index 118cdd26de73..c58765e03ef9 100644 --- a/explorer/testdata/interface/fail_impl_bad_member.carbon +++ b/explorer/testdata/interface/fail_impl_bad_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -22,7 +20,7 @@ class Point { } fn Scale[self: Point](v: i32) -> i32 { return 0; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_impl_bad_member.carbon:[[@LINE+3]]: type error in member of implementation + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_impl_bad_member.carbon:[[@LINE+3]]: type error in member of implementation // CHECK:STDERR: expected: fn (i32,) -> class Point // CHECK:STDERR: actual: fn (i32,) -> i32 } diff --git a/explorer/testdata/interface/fail_impl_missing_member.carbon b/explorer/testdata/interface/fail_impl_missing_member.carbon index 60b97a6d07dd..1f652b52b3af 100644 --- a/explorer/testdata/interface/fail_impl_missing_member.carbon +++ b/explorer/testdata/interface/fail_impl_missing_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -20,7 +18,7 @@ class Point { fn Add[self: Point](b: Point) -> Point { return {.x = self.x + b.x, .y = self.y + b.y}; } - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_impl_missing_member.carbon:[[@LINE+1]]: implementation missing Scale + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_impl_missing_member.carbon:[[@LINE+1]]: implementation missing Scale } } diff --git a/explorer/testdata/interface/fail_impl_not_type.carbon b/explorer/testdata/interface/fail_impl_not_type.carbon index bf350e70b8b5..dcbb86b72f71 100644 --- a/explorer/testdata/interface/fail_impl_not_type.carbon +++ b/explorer/testdata/interface/fail_impl_not_type.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface Vector { fn Zero() -> i32; } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_impl_not_type.carbon:[[@LINE+1]]: type error in type expression: 'String' is not implicitly convertible to 'type' +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_impl_not_type.carbon:[[@LINE+1]]: type error in type expression: 'String' is not implicitly convertible to 'type' impl "hello" as Vector { fn Zero() -> i32 { return 0; } } diff --git a/explorer/testdata/interface/fail_interface_missing_member.carbon b/explorer/testdata/interface/fail_interface_missing_member.carbon index 4b20dec653d9..da6a2ece03a1 100644 --- a/explorer/testdata/interface/fail_interface_missing_member.carbon +++ b/explorer/testdata/interface/fail_interface_missing_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ interface Vector { } fn ScaleGeneric[T:! Vector](a: T, s: i32) -> T { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_interface_missing_member.carbon:[[@LINE+1]]: member access, Scale not in interface Vector where T impls interface Vector + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_interface_missing_member.carbon:[[@LINE+1]]: member access, Scale not in interface Vector where T impls interface Vector return a.Scale(s); } diff --git a/explorer/testdata/interface/fail_member_lookup_in_definition.carbon b/explorer/testdata/interface/fail_member_lookup_in_definition.carbon index 9f45b6ab6b2a..6cc240a680c6 100644 --- a/explorer/testdata/interface/fail_member_lookup_in_definition.carbon +++ b/explorer/testdata/interface/fail_member_lookup_in_definition.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface Vector { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_member_lookup_in_definition.carbon:[[@LINE+1]]: incomplete type `interface Vector` used in member access + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_member_lookup_in_definition.carbon:[[@LINE+1]]: incomplete type `interface Vector` used in member access fn ScalarZero() -> Vector.ScalarType; let ScalarType:! type; } diff --git a/explorer/testdata/interface/fail_no_impl.carbon b/explorer/testdata/interface/fail_no_impl.carbon index 6ff81021ef9b..5ecb5df3837c 100644 --- a/explorer/testdata/interface/fail_no_impl.carbon +++ b/explorer/testdata/interface/fail_no_impl.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -25,7 +23,7 @@ fn AddAndScaleGeneric[T:! Vector](a: T, b: T, s: i32) -> T { fn Main() -> i32 { var a: Point = {.x = 0, .y = 0}; var b: Point = {.x = 2, .y = 3}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_no_impl.carbon:[[@LINE+1]]: could not find implementation of interface Vector for class Point + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_no_impl.carbon:[[@LINE+1]]: could not find implementation of interface Vector for class Point var p: Point = AddAndScaleGeneric(a, b, 3); return p.x - 6; } diff --git a/explorer/testdata/interface/fail_qualified_method.carbon b/explorer/testdata/interface/fail_qualified_method.carbon index 3765e3627832..cc49d49155e9 100644 --- a/explorer/testdata/interface/fail_qualified_method.carbon +++ b/explorer/testdata/interface/fail_qualified_method.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface Vector { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_qualified_method.carbon:[[@LINE+1]]: qualified declaration names are not permitted in this context + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_qualified_method.carbon:[[@LINE+1]]: qualified declaration names are not permitted in this context fn Vector.Zero() -> i32; } diff --git a/explorer/testdata/interface/fail_self_lookup_in_definition.carbon b/explorer/testdata/interface/fail_self_lookup_in_definition.carbon index 34f2137b9097..a03332a77ac7 100644 --- a/explorer/testdata/interface/fail_self_lookup_in_definition.carbon +++ b/explorer/testdata/interface/fail_self_lookup_in_definition.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface Vector { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_self_lookup_in_definition.carbon:[[@LINE+1]]: incomplete type `interface Vector` used in member access + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_self_lookup_in_definition.carbon:[[@LINE+1]]: incomplete type `interface Vector` used in member access fn ScalarZero() -> Self.ScalarType; let ScalarType:! type; } diff --git a/explorer/testdata/interface/fail_use_assoc_const_before_decl.carbon b/explorer/testdata/interface/fail_use_assoc_const_before_decl.carbon index 754eac6d3fdd..6a4a48154845 100644 --- a/explorer/testdata/interface/fail_use_assoc_const_before_decl.carbon +++ b/explorer/testdata/interface/fail_use_assoc_const_before_decl.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface IFace { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_use_assoc_const_before_decl.carbon:[[@LINE+1]]: 'C' has not been declared yet + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_use_assoc_const_before_decl.carbon:[[@LINE+1]]: 'C' has not been declared yet let B:! C; let C:! IFace; } diff --git a/explorer/testdata/interface/fail_use_assoc_const_in_defn.carbon b/explorer/testdata/interface/fail_use_assoc_const_in_defn.carbon index 26648cb0e58f..6bb17628a6bb 100644 --- a/explorer/testdata/interface/fail_use_assoc_const_in_defn.carbon +++ b/explorer/testdata/interface/fail_use_assoc_const_in_defn.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; interface IFace { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_use_assoc_const_in_defn.carbon:[[@LINE+1]]: 'T' is not usable until after it has been completely declared + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_use_assoc_const_in_defn.carbon:[[@LINE+1]]: 'T' is not usable until after it has been completely declared let T:! T.IFace; } diff --git a/explorer/testdata/interface/fail_use_symbolic_member.carbon b/explorer/testdata/interface/fail_use_symbolic_member.carbon index cd6537a306e3..96654bf9ffcf 100644 --- a/explorer/testdata/interface/fail_use_symbolic_member.carbon +++ b/explorer/testdata/interface/fail_use_symbolic_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ interface X { fn F() -> type; } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_use_symbolic_member.carbon:[[@LINE+1]]: member lookup for F in symbolic witness 0 of witness for T:! X +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/interface/fail_use_symbolic_member.carbon:[[@LINE+1]]: member lookup for F in symbolic witness 0 of witness for T:! X fn G[T:! X]() -> T.F() { return {}; } diff --git a/explorer/testdata/interface/generic_call_generic.carbon b/explorer/testdata/interface/generic_call_generic.carbon index 066173a5004c..1e44084b1b24 100644 --- a/explorer/testdata/interface/generic_call_generic.carbon +++ b/explorer/testdata/interface/generic_call_generic.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/generic_with_two_params.carbon b/explorer/testdata/interface/generic_with_two_params.carbon index 8438d535e8eb..0966d5dd4f0e 100644 --- a/explorer/testdata/interface/generic_with_two_params.carbon +++ b/explorer/testdata/interface/generic_with_two_params.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/impl_as.carbon b/explorer/testdata/interface/impl_as.carbon index 138eaec68634..38a7ece9ef65 100644 --- a/explorer/testdata/interface/impl_as.carbon +++ b/explorer/testdata/interface/impl_as.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Carrot.G // CHECK:STDOUT: result: 5 diff --git a/explorer/testdata/interface/impl_as_not_self.carbon b/explorer/testdata/interface/impl_as_not_self.carbon index df823c98dc95..674cb9bd2cfa 100644 --- a/explorer/testdata/interface/impl_as_not_self.carbon +++ b/explorer/testdata/interface/impl_as_not_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 5 package ExplorerTest api; diff --git a/explorer/testdata/interface/impl_self_interface_parameter.carbon b/explorer/testdata/interface/impl_self_interface_parameter.carbon index 854b5b6d9822..3ddeb98ba7ea 100644 --- a/explorer/testdata/interface/impl_self_interface_parameter.carbon +++ b/explorer/testdata/interface/impl_self_interface_parameter.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/interface_name_invalid.carbon b/explorer/testdata/interface/interface_name_invalid.carbon index 752ffc2b5095..653272ad868d 100644 --- a/explorer/testdata/interface/interface_name_invalid.carbon +++ b/explorer/testdata/interface/interface_name_invalid.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/omit_self.carbon b/explorer/testdata/interface/omit_self.carbon index b2c10f2d9aec..a12fc7025b66 100644 --- a/explorer/testdata/interface/omit_self.carbon +++ b/explorer/testdata/interface/omit_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/param_with_dependent_type.carbon b/explorer/testdata/interface/param_with_dependent_type.carbon index a6364710679f..cb116b64b0a4 100644 --- a/explorer/testdata/interface/param_with_dependent_type.carbon +++ b/explorer/testdata/interface/param_with_dependent_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 42 package ExplorerTest api; diff --git a/explorer/testdata/interface/parameterized.carbon b/explorer/testdata/interface/parameterized.carbon index 92ad3e486aa7..2ba1a699350e 100644 --- a/explorer/testdata/interface/parameterized.carbon +++ b/explorer/testdata/interface/parameterized.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/tuple_vector_add_scale.carbon b/explorer/testdata/interface/tuple_vector_add_scale.carbon index 338527f72c5b..13c0e82c6366 100644 --- a/explorer/testdata/interface/tuple_vector_add_scale.carbon +++ b/explorer/testdata/interface/tuple_vector_add_scale.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/type_of_type.carbon b/explorer/testdata/interface/type_of_type.carbon index 4221e8ec8716..aa8862002595 100644 --- a/explorer/testdata/interface/type_of_type.carbon +++ b/explorer/testdata/interface/type_of_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/vector_point_add_scale.carbon b/explorer/testdata/interface/vector_point_add_scale.carbon index 9f1e34c0e47b..e8aba50d6442 100644 --- a/explorer/testdata/interface/vector_point_add_scale.carbon +++ b/explorer/testdata/interface/vector_point_add_scale.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/interface/with_self.carbon b/explorer/testdata/interface/with_self.carbon index 27da07f57f9d..6378b06e22f3 100644 --- a/explorer/testdata/interface/with_self.carbon +++ b/explorer/testdata/interface/with_self.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/let/fail_function_args.carbon b/explorer/testdata/let/fail_function_args.carbon index 9b7ea3208f3a..9133062b5138 100644 --- a/explorer/testdata/let/fail_function_args.carbon +++ b/explorer/testdata/let/fail_function_args.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn f((var x: i32, y: i32)) -> i32 { x = 0; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/let/fail_function_args.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `y` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/let/fail_function_args.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `y` y = 0; return x - 1; } diff --git a/explorer/testdata/let/fail_global_assign.carbon b/explorer/testdata/let/fail_global_assign.carbon index 7aca2f45e621..fc8ebed7add1 100644 --- a/explorer/testdata/let/fail_global_assign.carbon +++ b/explorer/testdata/let/fail_global_assign.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; let x: i32 = 10; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/let/fail_global_assign.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `x` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/let/fail_global_assign.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `x` x = 0; return 0; } diff --git a/explorer/testdata/let/fail_global_named_self.carbon b/explorer/testdata/let/fail_global_named_self.carbon index 66fbcf185678..5349e72a9630 100644 --- a/explorer/testdata/let/fail_global_named_self.carbon +++ b/explorer/testdata/let/fail_global_named_self.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; // Error: Can't use keyword `Self` as the name of a global. -// CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/let/fail_global_named_self.carbon:[[@LINE+1]]: syntax error, unexpected SELF, expecting identifier +// CHECK:STDERR: SYNTAX ERROR: explorer/testdata/let/fail_global_named_self.carbon:[[@LINE+1]]: syntax error, unexpected SELF, expecting identifier let Self: i32 = 10; fn Main() -> i32 { diff --git a/explorer/testdata/let/fail_local_assign.carbon b/explorer/testdata/let/fail_local_assign.carbon index af71c8211567..a1425781443e 100644 --- a/explorer/testdata/let/fail_local_assign.carbon +++ b/explorer/testdata/let/fail_local_assign.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { let x: auto = 10; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/let/fail_local_assign.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `x` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/let/fail_local_assign.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `x` x = 0; return 0; } diff --git a/explorer/testdata/let/fail_local_named_self.carbon b/explorer/testdata/let/fail_local_named_self.carbon index 6523b4c481a8..01a4e6c5d4e9 100644 --- a/explorer/testdata/let/fail_local_named_self.carbon +++ b/explorer/testdata/let/fail_local_named_self.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { // Error: Can't use keyword `Self` as the name of a local. - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/let/fail_local_named_self.carbon:[[@LINE+1]]: syntax error, unexpected COLON, expecting EQUAL + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/let/fail_local_named_self.carbon:[[@LINE+1]]: syntax error, unexpected COLON, expecting EQUAL let Self: auto = 10; return 0; } diff --git a/explorer/testdata/let/fail_match_choice.carbon b/explorer/testdata/let/fail_match_choice.carbon index 67538118b06c..85bfd60e8381 100644 --- a/explorer/testdata/let/fail_match_choice.carbon +++ b/explorer/testdata/let/fail_match_choice.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -25,7 +23,7 @@ fn Main() -> i32 { n = n - 1; } case Ints.Two(x: auto, y: auto) => { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/let/fail_match_choice.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `x` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/let/fail_match_choice.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `x` x = 0; } } diff --git a/explorer/testdata/let/fail_method_args.carbon b/explorer/testdata/let/fail_method_args.carbon index 9ab657ef8642..0e5956002030 100644 --- a/explorer/testdata/let/fail_method_args.carbon +++ b/explorer/testdata/let/fail_method_args.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ class Point { } fn SetX[self: Point](x: i32) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/let/fail_method_args.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `x` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/let/fail_method_args.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `x` x = 10; } diff --git a/explorer/testdata/let/fail_tuple_pattern_let_context.carbon b/explorer/testdata/let/fail_tuple_pattern_let_context.carbon index 867415597fb0..7e1465b993a2 100644 --- a/explorer/testdata/let/fail_tuple_pattern_let_context.carbon +++ b/explorer/testdata/let/fail_tuple_pattern_let_context.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ fn Main() -> i32 { let (var a: auto, b: auto, c: auto, d: auto) = (1, 2, 3, 4); a = 0; // should fail - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/let/fail_tuple_pattern_let_context.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `c` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/let/fail_tuple_pattern_let_context.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `c` c = 0; return 0; } diff --git a/explorer/testdata/let/fail_tuple_pattern_let_context_nested.carbon b/explorer/testdata/let/fail_tuple_pattern_let_context_nested.carbon index 33ae08c0e026..57de6efa7363 100644 --- a/explorer/testdata/let/fail_tuple_pattern_let_context_nested.carbon +++ b/explorer/testdata/let/fail_tuple_pattern_let_context_nested.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/let/fail_tuple_pattern_let_context_nested.carbon:[[@LINE+1]]: syntax error, unexpected LET + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/let/fail_tuple_pattern_let_context_nested.carbon:[[@LINE+1]]: syntax error, unexpected LET let (var a: auto, b: auto, c: auto, var (d: auto, let e: auto)) = (1, 2, 3, (4, 5)); return 0; diff --git a/explorer/testdata/let/fail_tuple_pattern_let_in_var.carbon b/explorer/testdata/let/fail_tuple_pattern_let_in_var.carbon index 93f4012986d5..e40f2ead0ce1 100644 --- a/explorer/testdata/let/fail_tuple_pattern_let_in_var.carbon +++ b/explorer/testdata/let/fail_tuple_pattern_let_in_var.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/let/fail_tuple_pattern_let_in_var.carbon:[[@LINE+1]]: syntax error, unexpected LET + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/let/fail_tuple_pattern_let_in_var.carbon:[[@LINE+1]]: syntax error, unexpected LET var (var a: auto, b: auto, let c: auto, d: auto) = (1, 2, 3, 4); return 0; } diff --git a/explorer/testdata/let/implicit_conversion.carbon b/explorer/testdata/let/implicit_conversion.carbon index 9906fc993878..06b41abd2f19 100644 --- a/explorer/testdata/let/implicit_conversion.carbon +++ b/explorer/testdata/let/implicit_conversion.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/let/implicit_conversion_choice.carbon b/explorer/testdata/let/implicit_conversion_choice.carbon index 5af6590b9729..78ece4ebdde6 100644 --- a/explorer/testdata/let/implicit_conversion_choice.carbon +++ b/explorer/testdata/let/implicit_conversion_choice.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/let/nested_tuple_pattern.carbon b/explorer/testdata/let/nested_tuple_pattern.carbon index f1df8d7c3a87..b0016de3d3d8 100644 --- a/explorer/testdata/let/nested_tuple_pattern.carbon +++ b/explorer/testdata/let/nested_tuple_pattern.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/limits/README.md b/explorer/testdata/limits/README.md deleted file mode 100644 index 3a58c6df3386..000000000000 --- a/explorer/testdata/limits/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Limit tests - - - -These tests check for various limit conditions (such as an infinite loop). The -tests collectively disable autoupdate so that tracing isn't enabled, because -tracing creates substantial additional overhead. diff --git a/explorer/testdata/limits/fail_allocate.carbon b/explorer/testdata/limits/fail_allocate.carbon index 2e5fee0e9ff7..cb66560286b4 100644 --- a/explorer/testdata/limits/fail_allocate.carbon +++ b/explorer/testdata/limits/fail_allocate.carbon @@ -2,9 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // -// NOAUTOUPDATE -// RUN: %{not} %{explorer-run} -// CHECK:STDERR: RUNTIME ERROR: overflow:1: Possible infinite loop: too many interpreter steps executed +// AUTOUPDATE +// CHECK:STDERR: RUNTIME ERROR: overflow:1: possible infinite loop: too many interpreter steps executed package EmptyIdentifier impl; diff --git a/explorer/testdata/limits/fail_function_recursion.carbon b/explorer/testdata/limits/fail_function_recursion.carbon index e502cc7a0db1..9f9cea711b0c 100644 --- a/explorer/testdata/limits/fail_function_recursion.carbon +++ b/explorer/testdata/limits/fail_function_recursion.carbon @@ -2,9 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // -// NOAUTOUPDATE -// RUN: %{not} %{explorer-run} -// CHECK:STDERR: RUNTIME ERROR: overflow:1: Stack overflow: too many interpreter actions on stack +// AUTOUPDATE +// CHECK:STDERR: RUNTIME ERROR: overflow:1: stack overflow: too many interpreter actions on stack package EmptyIdentifier impl; diff --git a/explorer/testdata/limits/fail_loop.carbon b/explorer/testdata/limits/fail_loop.carbon index 76c544ff9275..9e40a83c2f1d 100644 --- a/explorer/testdata/limits/fail_loop.carbon +++ b/explorer/testdata/limits/fail_loop.carbon @@ -2,9 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // -// NOAUTOUPDATE -// RUN: %{not} %{explorer-run} -// CHECK:STDERR: RUNTIME ERROR: overflow:1: Possible infinite loop: too many interpreter steps executed +// AUTOUPDATE +// CHECK:STDERR: RUNTIME ERROR: overflow:1: possible infinite loop: too many interpreter steps executed package ExplorerTest impl; diff --git a/explorer/testdata/limits/fail_type_check_loop.carbon b/explorer/testdata/limits/fail_type_check_loop.carbon index a6a98e51e766..29098a5a9782 100644 --- a/explorer/testdata/limits/fail_type_check_loop.carbon +++ b/explorer/testdata/limits/fail_type_check_loop.carbon @@ -2,9 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // -// NOAUTOUPDATE -// RUN: %{not} %{explorer-run} -// CHECK:STDERR: COMPILATION ERROR: overflow:1: Possible infinite loop: too many interpreter steps executed +// AUTOUPDATE +// CHECK:STDERR: COMPILATION ERROR: overflow:1: possible infinite loop: too many interpreter steps executed package ExplorerTest impl; diff --git a/explorer/testdata/linked_list/linked_list.carbon b/explorer/testdata/linked_list/linked_list.carbon index fe157c22b21b..3d61d9d1ff7f 100644 --- a/explorer/testdata/linked_list/linked_list.carbon +++ b/explorer/testdata/linked_list/linked_list.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 1 // CHECK:STDOUT: 2 // CHECK:STDOUT: 3 diff --git a/explorer/testdata/linked_list/typed_linked_list.carbon b/explorer/testdata/linked_list/typed_linked_list.carbon index 468480f1391f..f221d1e3adea 100644 --- a/explorer/testdata/linked_list/typed_linked_list.carbon +++ b/explorer/testdata/linked_list/typed_linked_list.carbon @@ -3,8 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // This doesn't test trace ouptut because it's too slow. -// NOAUTOUPDATE -// RUN: %{explorer-run} +// AUTOUPDATE // CHECK:STDOUT: String list length is: 7 // CHECK:STDOUT: This is a String Entry 4 // CHECK:STDOUT: Value 1337 diff --git a/explorer/testdata/match/any_int.carbon b/explorer/testdata/match/any_int.carbon index 416de606678f..11bd1e8c3cf2 100644 --- a/explorer/testdata/match/any_int.carbon +++ b/explorer/testdata/match/any_int.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/match/convert.carbon b/explorer/testdata/match/convert.carbon index a280ee75dde0..aeba622589f5 100644 --- a/explorer/testdata/match/convert.carbon +++ b/explorer/testdata/match/convert.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/match/exhaustive.carbon b/explorer/testdata/match/exhaustive.carbon index c9d037c305da..68076512a659 100644 --- a/explorer/testdata/match/exhaustive.carbon +++ b/explorer/testdata/match/exhaustive.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/match/exhaustive_bool.carbon b/explorer/testdata/match/exhaustive_bool.carbon index 82e939cb9bfc..7302affef25c 100644 --- a/explorer/testdata/match/exhaustive_bool.carbon +++ b/explorer/testdata/match/exhaustive_bool.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 2 package ExplorerTest api; diff --git a/explorer/testdata/match/exhaustive_exponential_8x.carbon b/explorer/testdata/match/exhaustive_exponential_8x.carbon index 8ec84af93619..e579f0bf0f55 100644 --- a/explorer/testdata/match/exhaustive_exponential_8x.carbon +++ b/explorer/testdata/match/exhaustive_exponential_8x.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/match/exhaustive_exponential_series_t.carbon b/explorer/testdata/match/exhaustive_exponential_series_t.carbon index f35a107799c4..7dbd3030ab02 100644 --- a/explorer/testdata/match/exhaustive_exponential_series_t.carbon +++ b/explorer/testdata/match/exhaustive_exponential_series_t.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/match/fail_exhaustive_exponential_9x.carbon b/explorer/testdata/match/fail_exhaustive_exponential_9x.carbon index ff2c8565a332..787b87770e66 100644 --- a/explorer/testdata/match/fail_exhaustive_exponential_9x.carbon +++ b/explorer/testdata/match/fail_exhaustive_exponential_9x.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -29,5 +27,5 @@ fn Main() -> i32 { case (_: AB, _: AB, _: AB, _: AB, _: AB, _: AB, _: AB, AB.B(), AB.A()) => { return 8; } case (_: AB, _: AB, _: AB, _: AB, _: AB, _: AB, _: AB, _: AB, AB.B()) => { return 9; } } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/match/fail_exhaustive_exponential_9x.carbon:[[@LINE+1]]: non-exhaustive match may allow control-flow to reach the end of a function that provides a `->` return type +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/match/fail_exhaustive_exponential_9x.carbon:[[@LINE+1]]: non-exhaustive match may allow control-flow to reach the end of a function that provides a `->` return type } diff --git a/explorer/testdata/match/fail_exhaustive_exponential_series_t.carbon b/explorer/testdata/match/fail_exhaustive_exponential_series_t.carbon index bda01d78c4b8..8faabfe4c0fc 100644 --- a/explorer/testdata/match/fail_exhaustive_exponential_series_t.carbon +++ b/explorer/testdata/match/fail_exhaustive_exponential_series_t.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -38,5 +36,5 @@ fn Main() -> i32 { case (_: AB, _: AB, _: AB, _: AB, _: AB, _: AB, _: AB, _: AB, AB.A()) => { return 16; } case (_: AB, _: AB, _: AB, _: AB, _: AB, _: AB, _: AB, _: AB, AB.B()) => { return 17; } } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/match/fail_exhaustive_exponential_series_t.carbon:[[@LINE+1]]: non-exhaustive match may allow control-flow to reach the end of a function that provides a `->` return type +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/match/fail_exhaustive_exponential_series_t.carbon:[[@LINE+1]]: non-exhaustive match may allow control-flow to reach the end of a function that provides a `->` return type } diff --git a/explorer/testdata/match/fail_exhaustive_int.carbon b/explorer/testdata/match/fail_exhaustive_int.carbon index b028ed98acc5..344e53216b2c 100644 --- a/explorer/testdata/match/fail_exhaustive_int.carbon +++ b/explorer/testdata/match/fail_exhaustive_int.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ fn A(n: i32) -> i32 { case 1 => { return 1; } case 2 => { return 2; } } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/match/fail_exhaustive_int.carbon:[[@LINE+1]]: non-exhaustive match may allow control-flow to reach the end of a function that provides a `->` return type +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/match/fail_exhaustive_int.carbon:[[@LINE+1]]: non-exhaustive match may allow control-flow to reach the end of a function that provides a `->` return type } fn Main() -> i32 { diff --git a/explorer/testdata/match/fail_not_alternative.carbon b/explorer/testdata/match/fail_not_alternative.carbon index f7b1f6319aa1..22794c0574be 100644 --- a/explorer/testdata/match/fail_not_alternative.carbon +++ b/explorer/testdata/match/fail_not_alternative.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32 = 0; match (x) { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/match/fail_not_alternative.carbon:[[@LINE+1]]: Alternative pattern must have the form of a field access. + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/match/fail_not_alternative.carbon:[[@LINE+1]]: Alternative pattern must have the form of a field access. case i32(n: i32) => { return 1; } diff --git a/explorer/testdata/match/fail_not_exhaustive.carbon b/explorer/testdata/match/fail_not_exhaustive.carbon index a3e419c475a1..9bffaab8f7d5 100644 --- a/explorer/testdata/match/fail_not_exhaustive.carbon +++ b/explorer/testdata/match/fail_not_exhaustive.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -18,7 +16,7 @@ fn A(a: Opt, b: Opt) -> i32 { case (Opt.Some(n: i32), _: auto) => { return n; } case (_: auto, Opt.Some(n: i32)) => { return n; } } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/match/fail_not_exhaustive.carbon:[[@LINE+1]]: non-exhaustive match may allow control-flow to reach the end of a function that provides a `->` return type +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/match/fail_not_exhaustive.carbon:[[@LINE+1]]: non-exhaustive match may allow control-flow to reach the end of a function that provides a `->` return type } fn Main() -> i32 { diff --git a/explorer/testdata/match/fail_not_reachable.carbon b/explorer/testdata/match/fail_not_reachable.carbon index c285a21e543e..bf8f915905be 100644 --- a/explorer/testdata/match/fail_not_reachable.carbon +++ b/explorer/testdata/match/fail_not_reachable.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -17,7 +15,7 @@ fn A(a: Opt, b: Opt) -> i32 { match ((a, b)) { case (Opt.Some(n: i32), _: auto) => { return n; } case (_: auto, Opt.Some(n: i32)) => { return n; } - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/match/fail_not_reachable.carbon:[[@LINE+1]]: unreachable case: all values matched by this case are matched by earlier cases + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/match/fail_not_reachable.carbon:[[@LINE+1]]: unreachable case: all values matched by this case are matched by earlier cases case (Opt.Some(m: i32), Opt.Some(n: i32)) => { return m + n; } } return 0; diff --git a/explorer/testdata/match/fail_not_reachable_default.carbon b/explorer/testdata/match/fail_not_reachable_default.carbon index 002d5a488048..b9026ccf2570 100644 --- a/explorer/testdata/match/fail_not_reachable_default.carbon +++ b/explorer/testdata/match/fail_not_reachable_default.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -18,7 +16,7 @@ fn A(a: Opt, b: Opt) -> i32 { case (Opt.None(), Opt.None()) => { return 0; } case (Opt.Some(n: i32), _: auto) => { return n; } case (_: auto, Opt.Some(n: i32)) => { return n; } - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/match/fail_not_reachable_default.carbon:[[@LINE+1]]: unreachable case: all values matched by this case are matched by earlier cases + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/match/fail_not_reachable_default.carbon:[[@LINE+1]]: unreachable case: all values matched by this case are matched by earlier cases default => { return -1; } } return 0; diff --git a/explorer/testdata/match/fail_pattern_type_mismatch.carbon b/explorer/testdata/match/fail_pattern_type_mismatch.carbon index 7c6d3db54533..0d4d5024a124 100644 --- a/explorer/testdata/match/fail_pattern_type_mismatch.carbon +++ b/explorer/testdata/match/fail_pattern_type_mismatch.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -21,7 +19,7 @@ fn Main() -> i32 { // expression when checking each pattern. match ((a, a)) { case (0, n: A) => { return 1; } - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/match/fail_pattern_type_mismatch.carbon:[[@LINE+3]]: type error in `match` pattern type + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/match/fail_pattern_type_mismatch.carbon:[[@LINE+3]]: type error in `match` pattern type // CHECK:STDERR: expected: (i32, class A) // CHECK:STDERR: actual: (class A, i32) case (n: A, 0) => { return 1; } diff --git a/explorer/testdata/match/fail_redundant_int.carbon b/explorer/testdata/match/fail_redundant_int.carbon index 83ffcf0d6c59..caaf62af1975 100644 --- a/explorer/testdata/match/fail_redundant_int.carbon +++ b/explorer/testdata/match/fail_redundant_int.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn A(n: i32) -> i32 { match (n) { case 1 => { return 1; } - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/match/fail_redundant_int.carbon:[[@LINE+1]]: unreachable case: all values matched by this case are matched by earlier cases + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/match/fail_redundant_int.carbon:[[@LINE+1]]: unreachable case: all values matched by this case are matched by earlier cases case 1 => { return 2; } case (_: i32) => { return 3; } } diff --git a/explorer/testdata/match/int.carbon b/explorer/testdata/match/int.carbon index 54cc7e5eba73..59d74d34ad45 100644 --- a/explorer/testdata/match/int.carbon +++ b/explorer/testdata/match/int.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/match/int_default.carbon b/explorer/testdata/match/int_default.carbon index 0024c14b92df..e81b34dc7c46 100644 --- a/explorer/testdata/match/int_default.carbon +++ b/explorer/testdata/match/int_default.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/match/no_match.carbon b/explorer/testdata/match/no_match.carbon index 456306e618e2..6e35b6d2efbf 100644 --- a/explorer/testdata/match/no_match.carbon +++ b/explorer/testdata/match/no_match.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/match/placeholder.carbon b/explorer/testdata/match/placeholder.carbon index b50663c9f11f..1cf573bceef0 100644 --- a/explorer/testdata/match/placeholder.carbon +++ b/explorer/testdata/match/placeholder.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/member_access/arrow.carbon b/explorer/testdata/member_access/arrow.carbon index cc03a6216cbd..87364b5038b7 100644 --- a/explorer/testdata/member_access/arrow.carbon +++ b/explorer/testdata/member_access/arrow.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 1 // CHECK:STDOUT: 1 // CHECK:STDOUT: 1 diff --git a/explorer/testdata/member_access/convert_lhs_class.carbon b/explorer/testdata/member_access/convert_lhs_class.carbon index f88459bcd106..a77369c39506 100644 --- a/explorer/testdata/member_access/convert_lhs_class.carbon +++ b/explorer/testdata/member_access/convert_lhs_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package Foo api; diff --git a/explorer/testdata/member_access/convert_lhs_interface.carbon b/explorer/testdata/member_access/convert_lhs_interface.carbon index 13d3b0f060f0..cc42235632cc 100644 --- a/explorer/testdata/member_access/convert_lhs_interface.carbon +++ b/explorer/testdata/member_access/convert_lhs_interface.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package Foo api; diff --git a/explorer/testdata/member_access/convert_lhs_struct.carbon b/explorer/testdata/member_access/convert_lhs_struct.carbon index 827e8b94f7be..66d0e4978fad 100644 --- a/explorer/testdata/member_access/convert_lhs_struct.carbon +++ b/explorer/testdata/member_access/convert_lhs_struct.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package Foo api; diff --git a/explorer/testdata/member_access/evaluate_type_before_dot.carbon b/explorer/testdata/member_access/evaluate_type_before_dot.carbon index ea022bc1c9f2..cef5dce79312 100644 --- a/explorer/testdata/member_access/evaluate_type_before_dot.carbon +++ b/explorer/testdata/member_access/evaluate_type_before_dot.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Struct OK // CHECK:STDOUT: Choice OK // CHECK:STDOUT: Class OK diff --git a/explorer/testdata/member_access/fail_qualified_non_member.carbon b/explorer/testdata/member_access/fail_qualified_non_member.carbon index 4c5b13ad2410..18458eb3994a 100644 --- a/explorer/testdata/member_access/fail_qualified_non_member.carbon +++ b/explorer/testdata/member_access/fail_qualified_non_member.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package Foo api; fn F[self: i32]() {} fn Main() -> i32 { // TODO: It's unclear whether this is valid per the current rules. See // https://github.com/carbon-language/carbon-lang/pull/1122 - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/member_access/fail_qualified_non_member.carbon:[[@LINE+1]]: expected name of instance member or interface member in compound member access, found fn () -> () + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/member_access/fail_qualified_non_member.carbon:[[@LINE+1]]: expected name of instance member or interface member in compound member access, found fn () -> () 42.(F)(); return 0; } diff --git a/explorer/testdata/member_access/fail_vacuous_access.carbon b/explorer/testdata/member_access/fail_vacuous_access.carbon index a6eb74d90114..0bab8cb4b7c3 100644 --- a/explorer/testdata/member_access/fail_vacuous_access.carbon +++ b/explorer/testdata/member_access/fail_vacuous_access.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package Foo api; interface A { fn F() -> i32; } @@ -15,6 +13,6 @@ class X { } fn Main() -> i32 { var a: X = {}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/member_access/fail_vacuous_access.carbon:[[@LINE+1]]: expected name of instance member or interface member in compound member access, found fn () -> i32 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/member_access/fail_vacuous_access.carbon:[[@LINE+1]]: expected name of instance member or interface member in compound member access, found fn () -> i32 return a.(X.(A.F))(); } diff --git a/explorer/testdata/member_access/fail_vacuous_access_via_type_param.carbon b/explorer/testdata/member_access/fail_vacuous_access_via_type_param.carbon index 3dfc8014cdc0..eda3efb04129 100644 --- a/explorer/testdata/member_access/fail_vacuous_access_via_type_param.carbon +++ b/explorer/testdata/member_access/fail_vacuous_access_via_type_param.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package Foo api; interface A { fn F() -> i32; } @@ -14,7 +12,7 @@ class X { } } fn F[T:! A](a: T) -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/member_access/fail_vacuous_access_via_type_param.carbon:[[@LINE+1]]: expected name of instance member or interface member in compound member access, found fn () -> i32 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/member_access/fail_vacuous_access_via_type_param.carbon:[[@LINE+1]]: expected name of instance member or interface member in compound member access, found fn () -> i32 return a.(T.F)(); } fn Main() -> i32 { diff --git a/explorer/testdata/member_access/nearly_vacuous_access_with_impl_lookup.carbon b/explorer/testdata/member_access/nearly_vacuous_access_with_impl_lookup.carbon index a6b2411db912..aaf2822992c6 100644 --- a/explorer/testdata/member_access/nearly_vacuous_access_with_impl_lookup.carbon +++ b/explorer/testdata/member_access/nearly_vacuous_access_with_impl_lookup.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package Foo api; diff --git a/explorer/testdata/member_access/nearly_vacuous_access_with_instance_binding.carbon b/explorer/testdata/member_access/nearly_vacuous_access_with_instance_binding.carbon index edf6130e8662..d731290da077 100644 --- a/explorer/testdata/member_access/nearly_vacuous_access_with_instance_binding.carbon +++ b/explorer/testdata/member_access/nearly_vacuous_access_with_instance_binding.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package Foo api; diff --git a/explorer/testdata/member_access/param_qualified_interface_member.carbon b/explorer/testdata/member_access/param_qualified_interface_member.carbon index 2dc9fb5a6a1a..1d7b9cc5d8c8 100644 --- a/explorer/testdata/member_access/param_qualified_interface_member.carbon +++ b/explorer/testdata/member_access/param_qualified_interface_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package Foo api; diff --git a/explorer/testdata/member_access/qualified_class_member.carbon b/explorer/testdata/member_access/qualified_class_member.carbon index 37173ceb3664..f2206a64074e 100644 --- a/explorer/testdata/member_access/qualified_class_member.carbon +++ b/explorer/testdata/member_access/qualified_class_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package Foo api; diff --git a/explorer/testdata/member_access/qualified_constraint_member.carbon b/explorer/testdata/member_access/qualified_constraint_member.carbon index be671cdddd07..e000e82b44bb 100644 --- a/explorer/testdata/member_access/qualified_constraint_member.carbon +++ b/explorer/testdata/member_access/qualified_constraint_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 12 package Foo api; diff --git a/explorer/testdata/member_access/qualified_interface_member.carbon b/explorer/testdata/member_access/qualified_interface_member.carbon index 6975b3b87585..4ffb97aa1bd0 100644 --- a/explorer/testdata/member_access/qualified_interface_member.carbon +++ b/explorer/testdata/member_access/qualified_interface_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package Foo api; diff --git a/explorer/testdata/member_access/qualified_param_member.carbon b/explorer/testdata/member_access/qualified_param_member.carbon index cafdfb43444d..412e6805ec33 100644 --- a/explorer/testdata/member_access/qualified_param_member.carbon +++ b/explorer/testdata/member_access/qualified_param_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package Foo api; diff --git a/explorer/testdata/member_access/qualified_struct_member.carbon b/explorer/testdata/member_access/qualified_struct_member.carbon index 0cdcfd4511f1..7c7e008db98e 100644 --- a/explorer/testdata/member_access/qualified_struct_member.carbon +++ b/explorer/testdata/member_access/qualified_struct_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 2 package Foo api; diff --git a/explorer/testdata/member_access/type_qualified_interface_member.carbon b/explorer/testdata/member_access/type_qualified_interface_member.carbon index 60013f6e2b3f..4479829c7e3e 100644 --- a/explorer/testdata/member_access/type_qualified_interface_member.carbon +++ b/explorer/testdata/member_access/type_qualified_interface_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 42 package Foo api; diff --git a/explorer/testdata/mixin/fail_circular_mixing.carbon b/explorer/testdata/mixin/fail_circular_mixing.carbon index 615e63a7d065..72096f74cd92 100644 --- a/explorer/testdata/mixin/fail_circular_mixing.carbon +++ b/explorer/testdata/mixin/fail_circular_mixing.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; __mixin M1 { fn F1[self: Self](x: Self) -> Self{ return x; } - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_circular_mixing.carbon:[[@LINE+1]]: 'M3' has not been declared yet + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/mixin/fail_circular_mixing.carbon:[[@LINE+1]]: 'M3' has not been declared yet __mix M3; } diff --git a/explorer/testdata/mixin/fail_field_member_name_clash.carbon b/explorer/testdata/mixin/fail_field_member_name_clash.carbon index 738e606bc225..9f300188e8b4 100644 --- a/explorer/testdata/mixin/fail_field_member_name_clash.carbon +++ b/explorer/testdata/mixin/fail_field_member_name_clash.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -17,7 +15,7 @@ __mixin M { class C { let F: i32 = 0; __mix M; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_field_member_name_clash.carbon:[[@LINE+1]]: Member named F (declared at {{.*}}/explorer/testdata/mixin/fail_field_member_name_clash.carbon:[[@LINE-6]]) cannot be mixed into C because it clashes with an existing member with the same name (declared at {{.*}}/explorer/testdata/mixin/fail_field_member_name_clash.carbon:[[@LINE-2]]) +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/mixin/fail_field_member_name_clash.carbon:[[@LINE+1]]: Member named F (declared at explorer/testdata/mixin/fail_field_member_name_clash.carbon:[[@LINE-6]]) cannot be mixed into C because it clashes with an existing member with the same name (declared at explorer/testdata/mixin/fail_field_member_name_clash.carbon:[[@LINE-2]]) } fn Main() -> i32 { diff --git a/explorer/testdata/mixin/fail_method_member_name_clash.carbon b/explorer/testdata/mixin/fail_method_member_name_clash.carbon index 6bc581839b1e..cbb0c2454561 100644 --- a/explorer/testdata/mixin/fail_method_member_name_clash.carbon +++ b/explorer/testdata/mixin/fail_method_member_name_clash.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,7 +17,7 @@ class C { return x; } __mix M; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_method_member_name_clash.carbon:[[@LINE+1]]: Member named F (declared at {{.*}}/explorer/testdata/mixin/fail_method_member_name_clash.carbon:[[@LINE-8]]) cannot be mixed into C because it clashes with an existing member with the same name (declared at {{.*}}/explorer/testdata/mixin/fail_method_member_name_clash.carbon:[[@LINE-2]]) +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/mixin/fail_method_member_name_clash.carbon:[[@LINE+1]]: Member named F (declared at explorer/testdata/mixin/fail_method_member_name_clash.carbon:[[@LINE-8]]) cannot be mixed into C because it clashes with an existing member with the same name (declared at explorer/testdata/mixin/fail_method_member_name_clash.carbon:[[@LINE-2]]) } fn Main() -> i32 { diff --git a/explorer/testdata/mixin/fail_mix_as_type_expr.carbon b/explorer/testdata/mixin/fail_mix_as_type_expr.carbon index 0629a73fb947..171b85f12ece 100644 --- a/explorer/testdata/mixin/fail_mix_as_type_expr.carbon +++ b/explorer/testdata/mixin/fail_mix_as_type_expr.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; __mixin Operations {} fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_mix_as_type_expr.carbon:[[@LINE+1]]: invalid use of mixin Operations + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/mixin/fail_mix_as_type_expr.carbon:[[@LINE+1]]: invalid use of mixin Operations var a: Operations; return 0; } diff --git a/explorer/testdata/mixin/fail_mix_diamond_clash.carbon b/explorer/testdata/mixin/fail_mix_diamond_clash.carbon index 72a4273d20ef..a1c13c8ff586 100644 --- a/explorer/testdata/mixin/fail_mix_diamond_clash.carbon +++ b/explorer/testdata/mixin/fail_mix_diamond_clash.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; __mixin M1 { @@ -28,7 +26,7 @@ __mixin M3 { class C { __mix M2; __mix M3; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_mix_diamond_clash.carbon:[[@LINE+1]]: Member named F1 (declared at {{.*}}/explorer/testdata/mixin/fail_mix_diamond_clash.carbon:[[@LINE-18]]) is being mixed multiple times into C +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/mixin/fail_mix_diamond_clash.carbon:[[@LINE+1]]: Member named F1 (declared at explorer/testdata/mixin/fail_mix_diamond_clash.carbon:[[@LINE-18]]) is being mixed multiple times into C } fn Main() -> i32 { diff --git a/explorer/testdata/mixin/fail_mix_in_global.carbon b/explorer/testdata/mixin/fail_mix_in_global.carbon index 553896582a16..2f56afbe9fd5 100644 --- a/explorer/testdata/mixin/fail_mix_in_global.carbon +++ b/explorer/testdata/mixin/fail_mix_in_global.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,7 +12,7 @@ __mixin Operations { } } -// CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/mixin/fail_mix_in_global.carbon:[[@LINE+1]]: syntax error, unexpected MIX, expecting END_OF_FILE +// CHECK:STDERR: SYNTAX ERROR: explorer/testdata/mixin/fail_mix_in_global.carbon:[[@LINE+1]]: syntax error, unexpected MIX, expecting END_OF_FILE __mix Operations; class Point { diff --git a/explorer/testdata/mixin/fail_mix_in_impl.carbon b/explorer/testdata/mixin/fail_mix_in_impl.carbon index cb5cc5119a4e..a4089482cf27 100644 --- a/explorer/testdata/mixin/fail_mix_in_impl.carbon +++ b/explorer/testdata/mixin/fail_mix_in_impl.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,7 +17,7 @@ interface A { } external impl i32 as A { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/mixin/fail_mix_in_impl.carbon:[[@LINE+1]]: syntax error, unexpected MIX + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/mixin/fail_mix_in_impl.carbon:[[@LINE+1]]: syntax error, unexpected MIX __mix Operations; fn F() {} } diff --git a/explorer/testdata/mixin/fail_mix_invalid.carbon b/explorer/testdata/mixin/fail_mix_invalid.carbon index 02acb3dcfac7..0474f2b76363 100644 --- a/explorer/testdata/mixin/fail_mix_invalid.carbon +++ b/explorer/testdata/mixin/fail_mix_invalid.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; __mixin Mixin { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_mix_invalid.carbon:[[@LINE+1]]: Not a valid mixin: `()` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/mixin/fail_mix_invalid.carbon:[[@LINE+1]]: Not a valid mixin: `()` __mix (); } diff --git a/explorer/testdata/mixin/fail_mix_invalid_array.carbon b/explorer/testdata/mixin/fail_mix_invalid_array.carbon index 6c672b99d9a2..a7188f28fe47 100644 --- a/explorer/testdata/mixin/fail_mix_invalid_array.carbon +++ b/explorer/testdata/mixin/fail_mix_invalid_array.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class C { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_mix_invalid_array.carbon:[[@LINE+1]]: type error in type expression: 'bool' is not implicitly convertible to 'type' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/mixin/fail_mix_invalid_array.carbon:[[@LINE+1]]: type error in type expression: 'bool' is not implicitly convertible to 'type' __mix [true; true]; } diff --git a/explorer/testdata/mixin/fail_mix_members_clash.carbon b/explorer/testdata/mixin/fail_mix_members_clash.carbon index 97618a9590c3..365fe15169ad 100644 --- a/explorer/testdata/mixin/fail_mix_members_clash.carbon +++ b/explorer/testdata/mixin/fail_mix_members_clash.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; __mixin M1 { @@ -21,7 +19,7 @@ __mixin M2 { class C { __mix M1; __mix M2; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_mix_members_clash.carbon:[[@LINE+1]]: Member named F1 (declared at {{.*}}/explorer/testdata/mixin/fail_mix_members_clash.carbon:[[@LINE-6]]) cannot be mixed into C because it clashes with an existing member with the same name (declared at {{.*}}/explorer/testdata/mixin/fail_mix_members_clash.carbon:[[@LINE-11]]) +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/mixin/fail_mix_members_clash.carbon:[[@LINE+1]]: Member named F1 (declared at explorer/testdata/mixin/fail_mix_members_clash.carbon:[[@LINE-6]]) cannot be mixed into C because it clashes with an existing member with the same name (declared at explorer/testdata/mixin/fail_mix_members_clash.carbon:[[@LINE-11]]) } fn Main() -> i32 { diff --git a/explorer/testdata/mixin/fail_qualified_method.carbon b/explorer/testdata/mixin/fail_qualified_method.carbon index 1b5722f2e73c..5f620f363b24 100644 --- a/explorer/testdata/mixin/fail_qualified_method.carbon +++ b/explorer/testdata/mixin/fail_qualified_method.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; __mixin Operations { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_qualified_method.carbon:[[@LINE+1]]: qualified declaration names are not permitted in this context + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/mixin/fail_qualified_method.carbon:[[@LINE+1]]: qualified declaration names are not permitted in this context fn Operations.Square[self: Self](x:i32) -> i32{ return x * x; } diff --git a/explorer/testdata/mixin/fail_recursive_mixing.carbon b/explorer/testdata/mixin/fail_recursive_mixing.carbon index cbd240ade478..7af3c2f3335b 100644 --- a/explorer/testdata/mixin/fail_recursive_mixing.carbon +++ b/explorer/testdata/mixin/fail_recursive_mixing.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; __mixin M1 { fn F1[self: Self](x: Self) -> Self{ return x; } - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_recursive_mixing.carbon:[[@LINE+1]]: incomplete mixin `M1` used in mix declaration + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/mixin/fail_recursive_mixing.carbon:[[@LINE+1]]: incomplete mixin `M1` used in mix declaration __mix M1; } diff --git a/explorer/testdata/mixin/fail_self_substitution.carbon b/explorer/testdata/mixin/fail_self_substitution.carbon index 3782a00531f2..9bb637e17007 100644 --- a/explorer/testdata/mixin/fail_self_substitution.carbon +++ b/explorer/testdata/mixin/fail_self_substitution.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -36,7 +34,7 @@ class Complex { fn Main() -> i32 { var p: Point = Point.Origin(); var c: Complex = {.r = 42, .i = 1}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_self_substitution.carbon:[[@LINE+1]]: mismatch in non-deduced types, `class Complex` is not implicitly convertible to `class Point` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/mixin/fail_self_substitution.carbon:[[@LINE+1]]: mismatch in non-deduced types, `class Complex` is not implicitly convertible to `class Point` var p1: Point = p.F(c); return p1.x - 42; diff --git a/explorer/testdata/mixin/self_substitution.carbon b/explorer/testdata/mixin/self_substitution.carbon index d406b129e67e..f5bab36a4d87 100644 --- a/explorer/testdata/mixin/self_substitution.carbon +++ b/explorer/testdata/mixin/self_substitution.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/mixin/simple_mix_in_mixin.carbon b/explorer/testdata/mixin/simple_mix_in_mixin.carbon index 5df69ce369e3..a5b2054edaf7 100644 --- a/explorer/testdata/mixin/simple_mix_in_mixin.carbon +++ b/explorer/testdata/mixin/simple_mix_in_mixin.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/mixin/simple_reuse.carbon b/explorer/testdata/mixin/simple_reuse.carbon index fec4278b592f..faae412cab95 100644 --- a/explorer/testdata/mixin/simple_reuse.carbon +++ b/explorer/testdata/mixin/simple_reuse.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/mixin/use_mixin_method_in_class_method.carbon b/explorer/testdata/mixin/use_mixin_method_in_class_method.carbon index 04538db6b0dd..e3ad9a23a777 100644 --- a/explorer/testdata/mixin/use_mixin_method_in_class_method.carbon +++ b/explorer/testdata/mixin/use_mixin_method_in_class_method.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/name_lookup/class_fn_body_reorder.carbon b/explorer/testdata/name_lookup/class_fn_body_reorder.carbon index 0d18f7892414..599ee7820979 100644 --- a/explorer/testdata/name_lookup/class_fn_body_reorder.carbon +++ b/explorer/testdata/name_lookup/class_fn_body_reorder.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/name_lookup/fail_block_duplicate.carbon b/explorer/testdata/name_lookup/fail_block_duplicate.carbon index b2ebe00d99a6..1f3af89aff8f 100644 --- a/explorer/testdata/name_lookup/fail_block_duplicate.carbon +++ b/explorer/testdata/name_lookup/fail_block_duplicate.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32 = 0; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/name_lookup/fail_block_duplicate.carbon:[[@LINE+1]]: Duplicate name `x` also found at {{.*}}/explorer/testdata/name_lookup/fail_block_duplicate.carbon:[[@LINE-1]] + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/name_lookup/fail_block_duplicate.carbon:[[@LINE+1]]: Duplicate name `x` also found at explorer/testdata/name_lookup/fail_block_duplicate.carbon:[[@LINE-1]] var x: i32 = 0; return 0; } diff --git a/explorer/testdata/name_lookup/fail_choice_duplicate.carbon b/explorer/testdata/name_lookup/fail_choice_duplicate.carbon index 04c96afa53f9..f19dbb4b3999 100644 --- a/explorer/testdata/name_lookup/fail_choice_duplicate.carbon +++ b/explorer/testdata/name_lookup/fail_choice_duplicate.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; choice Ints { None, - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/name_lookup/fail_choice_duplicate.carbon:[[@LINE+1]]: Duplicate name `None` in choice type + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/name_lookup/fail_choice_duplicate.carbon:[[@LINE+1]]: Duplicate name `None` in choice type None, } diff --git a/explorer/testdata/name_lookup/fail_class_duplicate.carbon b/explorer/testdata/name_lookup/fail_class_duplicate.carbon index 299648e075b8..5e6c773d4ed2 100644 --- a/explorer/testdata/name_lookup/fail_class_duplicate.carbon +++ b/explorer/testdata/name_lookup/fail_class_duplicate.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class Foo { var x: i32; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/name_lookup/fail_class_duplicate.carbon:[[@LINE+1]]: Duplicate name `x` also found at {{.*}}/explorer/testdata/name_lookup/fail_class_duplicate.carbon:[[@LINE-1]] + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/name_lookup/fail_class_duplicate.carbon:[[@LINE+1]]: Duplicate name `x` also found at explorer/testdata/name_lookup/fail_class_duplicate.carbon:[[@LINE-1]] var x: i32; } diff --git a/explorer/testdata/name_lookup/fail_class_fn_use_before_declaration.carbon b/explorer/testdata/name_lookup/fail_class_fn_use_before_declaration.carbon index 0cfb07ab6534..910c0d68eb2f 100644 --- a/explorer/testdata/name_lookup/fail_class_fn_use_before_declaration.carbon +++ b/explorer/testdata/name_lookup/fail_class_fn_use_before_declaration.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,7 +17,7 @@ class A { return 0; } - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/name_lookup/fail_class_fn_use_before_declaration.carbon:[[@LINE+1]]: 'I' has not been declared yet + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/name_lookup/fail_class_fn_use_before_declaration.carbon:[[@LINE+1]]: 'I' has not been declared yet fn H() -> I() { return 0; } diff --git a/explorer/testdata/name_lookup/fail_class_use_in_params.carbon b/explorer/testdata/name_lookup/fail_class_use_in_params.carbon index 67efa56ae86d..9b5136bb850f 100644 --- a/explorer/testdata/name_lookup/fail_class_use_in_params.carbon +++ b/explorer/testdata/name_lookup/fail_class_use_in_params.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/name_lookup/fail_class_use_in_params.carbon:[[@LINE+1]]: 'A' is not usable until after it has been completely declared +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/name_lookup/fail_class_use_in_params.carbon:[[@LINE+1]]: 'A' is not usable until after it has been completely declared class A(X:! A(i32)) { } diff --git a/explorer/testdata/name_lookup/fail_fn_use_in_param.carbon b/explorer/testdata/name_lookup/fail_fn_use_in_param.carbon index ba0b9cb5f0b9..b0a86db3528b 100644 --- a/explorer/testdata/name_lookup/fail_fn_use_in_param.carbon +++ b/explorer/testdata/name_lookup/fail_fn_use_in_param.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/name_lookup/fail_fn_use_in_param.carbon:[[@LINE+1]]: 'F' is not usable until after it has been completely declared +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/name_lookup/fail_fn_use_in_param.carbon:[[@LINE+1]]: 'F' is not usable until after it has been completely declared fn F(x: F(0)) -> type { return i32; } diff --git a/explorer/testdata/name_lookup/fail_fn_use_in_return_type.carbon b/explorer/testdata/name_lookup/fail_fn_use_in_return_type.carbon index 893d85201260..af2cdde8755d 100644 --- a/explorer/testdata/name_lookup/fail_fn_use_in_return_type.carbon +++ b/explorer/testdata/name_lookup/fail_fn_use_in_return_type.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/name_lookup/fail_fn_use_in_return_type.carbon:[[@LINE+1]]: 'F' is not usable until after it has been completely declared +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/name_lookup/fail_fn_use_in_return_type.carbon:[[@LINE+1]]: 'F' is not usable until after it has been completely declared fn F() -> F() { return type; } diff --git a/explorer/testdata/name_lookup/fail_global_duplicate.carbon b/explorer/testdata/name_lookup/fail_global_duplicate.carbon index c20af979eb26..1ae57094a625 100644 --- a/explorer/testdata/name_lookup/fail_global_duplicate.carbon +++ b/explorer/testdata/name_lookup/fail_global_duplicate.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; var x: i32 = 0; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/name_lookup/fail_global_duplicate.carbon:[[@LINE+1]]: Duplicate name `x` also found at {{.*}}/explorer/testdata/name_lookup/fail_global_duplicate.carbon:[[@LINE-1]] +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/name_lookup/fail_global_duplicate.carbon:[[@LINE+1]]: Duplicate name `x` also found at explorer/testdata/name_lookup/fail_global_duplicate.carbon:[[@LINE-1]] var x: i32 = 0; fn Main() -> i32 { diff --git a/explorer/testdata/name_lookup/fail_use_before_declare.carbon b/explorer/testdata/name_lookup/fail_use_before_declare.carbon index 24cab8e30f1d..924ba2aed4aa 100644 --- a/explorer/testdata/name_lookup/fail_use_before_declare.carbon +++ b/explorer/testdata/name_lookup/fail_use_before_declare.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/name_lookup/fail_use_before_declare.carbon:[[@LINE+1]]: could not resolve 'x' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/name_lookup/fail_use_before_declare.carbon:[[@LINE+1]]: could not resolve 'x' x = 0; var x: i32 = 0; return 0; diff --git a/explorer/testdata/name_lookup/fail_var_use_before_declaration.carbon b/explorer/testdata/name_lookup/fail_var_use_before_declaration.carbon index 3d2386cf5b89..c0a5224734a3 100644 --- a/explorer/testdata/name_lookup/fail_var_use_before_declaration.carbon +++ b/explorer/testdata/name_lookup/fail_var_use_before_declaration.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; // Test that a global variable may not depend on a later global. // Error expected. -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/name_lookup/fail_var_use_before_declaration.carbon:[[@LINE+1]]: 'y' has not been declared yet +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/name_lookup/fail_var_use_before_declaration.carbon:[[@LINE+1]]: 'y' has not been declared yet var x: i32 = y; var y: i32 = 0; diff --git a/explorer/testdata/name_lookup/global_shadow.carbon b/explorer/testdata/name_lookup/global_shadow.carbon index ca6a35f612b4..700cb6a070ab 100644 --- a/explorer/testdata/name_lookup/global_shadow.carbon +++ b/explorer/testdata/name_lookup/global_shadow.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/name_lookup/match_shadow.carbon b/explorer/testdata/name_lookup/match_shadow.carbon index ea499ac1b79c..b18d0972a2a1 100644 --- a/explorer/testdata/name_lookup/match_shadow.carbon +++ b/explorer/testdata/name_lookup/match_shadow.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/named_constraint/extends.carbon b/explorer/testdata/named_constraint/extends.carbon index 105a6d941d7c..88bb0696d91c 100644 --- a/explorer/testdata/named_constraint/extends.carbon +++ b/explorer/testdata/named_constraint/extends.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 5 // CHECK:STDOUT: 5 // CHECK:STDOUT: 5 diff --git a/explorer/testdata/named_constraint/fail_associated_constant.carbon b/explorer/testdata/named_constraint/fail_associated_constant.carbon index b840ade2a129..8bab7670680d 100644 --- a/explorer/testdata/named_constraint/fail_associated_constant.carbon +++ b/explorer/testdata/named_constraint/fail_associated_constant.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; constraint X { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/named_constraint/fail_associated_constant.carbon:[[@LINE+1]]: associated constant not permitted in named constraint + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/named_constraint/fail_associated_constant.carbon:[[@LINE+1]]: associated constant not permitted in named constraint let N:! type; } diff --git a/explorer/testdata/named_constraint/fail_associated_function.carbon b/explorer/testdata/named_constraint/fail_associated_function.carbon index 972e4ebddb0a..4071500355bc 100644 --- a/explorer/testdata/named_constraint/fail_associated_function.carbon +++ b/explorer/testdata/named_constraint/fail_associated_function.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; constraint X { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/named_constraint/fail_associated_function.carbon:[[@LINE+1]]: associated function not permitted in named constraint + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/named_constraint/fail_associated_function.carbon:[[@LINE+1]]: associated function not permitted in named constraint fn F(); } diff --git a/explorer/testdata/named_constraint/fail_compound_member_access.carbon b/explorer/testdata/named_constraint/fail_compound_member_access.carbon index 684f3f100d77..43369f9212f3 100644 --- a/explorer/testdata/named_constraint/fail_compound_member_access.carbon +++ b/explorer/testdata/named_constraint/fail_compound_member_access.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -27,6 +25,6 @@ fn Main() -> i32 { // MemberName value. We will likely need MemberName to remember the // constraint as written, not only the interface in which the member was // found. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/named_constraint/fail_compound_member_access.carbon:[[@LINE+1]]: could not find implementation of interface MyAddWith(T = Self) for i32 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/named_constraint/fail_compound_member_access.carbon:[[@LINE+1]]: could not find implementation of interface MyAddWith(T = Self) for i32 return n.(MyAdd.Op)(n); } diff --git a/explorer/testdata/named_constraint/fail_impl_as_member_access.carbon b/explorer/testdata/named_constraint/fail_impl_as_member_access.carbon index 40299666d4ef..3a11c8a36fd9 100644 --- a/explorer/testdata/named_constraint/fail_impl_as_member_access.carbon +++ b/explorer/testdata/named_constraint/fail_impl_as_member_access.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,7 +17,7 @@ constraint ImplAsHasFoo { fn CallFoo[T:! ImplAsHasFoo](x: T) { // OK, T is HasFoo. x.(HasFoo.Foo)(); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/named_constraint/fail_impl_as_member_access.carbon:[[@LINE+1]]: member access, Foo not in constraint ImplAsHasFoo where T impls interface HasFoo + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/named_constraint/fail_impl_as_member_access.carbon:[[@LINE+1]]: member access, Foo not in constraint ImplAsHasFoo where T impls interface HasFoo x.Foo(); } diff --git a/explorer/testdata/named_constraint/impl_as.carbon b/explorer/testdata/named_constraint/impl_as.carbon index 73d11598387d..89cafeaf383c 100644 --- a/explorer/testdata/named_constraint/impl_as.carbon +++ b/explorer/testdata/named_constraint/impl_as.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 4 package ExplorerTest api; diff --git a/explorer/testdata/named_constraint/impl_constraint.carbon b/explorer/testdata/named_constraint/impl_constraint.carbon index 01896c53063b..2691c1f5bfd5 100644 --- a/explorer/testdata/named_constraint/impl_constraint.carbon +++ b/explorer/testdata/named_constraint/impl_constraint.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 12 package ExplorerTest api; diff --git a/explorer/testdata/namespace/builtin_in_namespace.carbon b/explorer/testdata/namespace/builtin_in_namespace.carbon index c4fca316fb31..839dfaa981fa 100644 --- a/explorer/testdata/namespace/builtin_in_namespace.carbon +++ b/explorer/testdata/namespace/builtin_in_namespace.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 2 package ExplorerTest api; diff --git a/explorer/testdata/namespace/declare.carbon b/explorer/testdata/namespace/declare.carbon index 1937dfbbf449..1321501ab9c2 100644 --- a/explorer/testdata/namespace/declare.carbon +++ b/explorer/testdata/namespace/declare.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/namespace/fail_members_not_in_outer_scope.carbon b/explorer/testdata/namespace/fail_members_not_in_outer_scope.carbon index 3d7d33b080c8..8c11523b2988 100644 --- a/explorer/testdata/namespace/fail_members_not_in_outer_scope.carbon +++ b/explorer/testdata/namespace/fail_members_not_in_outer_scope.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,6 +11,6 @@ namespace N; fn N.F() -> i32 { return 0; } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/namespace/fail_members_not_in_outer_scope.carbon:[[@LINE+1]]: could not resolve 'F' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/namespace/fail_members_not_in_outer_scope.carbon:[[@LINE+1]]: could not resolve 'F' return F(); } diff --git a/explorer/testdata/namespace/fail_missing_nested.carbon b/explorer/testdata/namespace/fail_missing_nested.carbon index 8f590c7fd15c..19e9f04949bc 100644 --- a/explorer/testdata/namespace/fail_missing_nested.carbon +++ b/explorer/testdata/namespace/fail_missing_nested.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ namespace A; namespace A.B; namespace A.B.C; fn A.B.C. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/namespace/fail_missing_nested.carbon:[[@LINE+1]]: name 'D' has not been declared in namespace A.B.C + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/namespace/fail_missing_nested.carbon:[[@LINE+1]]: name 'D' has not been declared in namespace A.B.C D // Don't combine with the previous line. This test is verifying that the // diagnostic points at the right token. diff --git a/explorer/testdata/namespace/fail_qualifier_not_namespace.carbon b/explorer/testdata/namespace/fail_qualifier_not_namespace.carbon index 4277b7a18d4c..f2acd0458f74 100644 --- a/explorer/testdata/namespace/fail_qualifier_not_namespace.carbon +++ b/explorer/testdata/namespace/fail_qualifier_not_namespace.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn F() {} -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/namespace/fail_qualifier_not_namespace.carbon:[[@LINE+1]]: fn F cannot be used as a name qualifier +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/namespace/fail_qualifier_not_namespace.carbon:[[@LINE+1]]: fn F cannot be used as a name qualifier fn F.G() {} fn Main() -> i32 { diff --git a/explorer/testdata/namespace/fail_unknown_member.carbon b/explorer/testdata/namespace/fail_unknown_member.carbon index 21a3ed2df814..176c6e54e193 100644 --- a/explorer/testdata/namespace/fail_unknown_member.carbon +++ b/explorer/testdata/namespace/fail_unknown_member.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; namespace N; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/namespace/fail_unknown_member.carbon:[[@LINE+1]]: name 'value' has not been declared in namespace N + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/namespace/fail_unknown_member.carbon:[[@LINE+1]]: name 'value' has not been declared in namespace N return N.value; } diff --git a/explorer/testdata/namespace/fail_unknown_namespace.carbon b/explorer/testdata/namespace/fail_unknown_namespace.carbon index 8c0c2cd55dcd..e7fe5aab82c4 100644 --- a/explorer/testdata/namespace/fail_unknown_namespace.carbon +++ b/explorer/testdata/namespace/fail_unknown_namespace.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/namespace/fail_unknown_namespace.carbon:[[@LINE+1]]: name 'N' has not been declared in this scope +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/namespace/fail_unknown_namespace.carbon:[[@LINE+1]]: name 'N' has not been declared in this scope fn N.F() {} fn Main() -> i32 { diff --git a/explorer/testdata/namespace/fail_use_as_expression.carbon b/explorer/testdata/namespace/fail_use_as_expression.carbon index 8cfb4e7d849e..9747035a5be4 100644 --- a/explorer/testdata/namespace/fail_use_as_expression.carbon +++ b/explorer/testdata/namespace/fail_use_as_expression.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; namespace N; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/namespace/fail_use_as_expression.carbon:[[@LINE+1]]: expected `.member_name` after name of namespace N + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/namespace/fail_use_as_expression.carbon:[[@LINE+1]]: expected `.member_name` after name of namespace N N; return 0; } diff --git a/explorer/testdata/namespace/fail_use_as_value.carbon b/explorer/testdata/namespace/fail_use_as_value.carbon index 476a16d385db..c4a113374d56 100644 --- a/explorer/testdata/namespace/fail_use_as_value.carbon +++ b/explorer/testdata/namespace/fail_use_as_value.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,6 +11,6 @@ namespace N; fn F[T:! type](x: T) -> T { return x; } fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/namespace/fail_use_as_value.carbon:[[@LINE+1]]: expected `.member_name` after name of namespace N + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/namespace/fail_use_as_value.carbon:[[@LINE+1]]: expected `.member_name` after name of namespace N return F(N); } diff --git a/explorer/testdata/namespace/generic_parameter_scope.carbon b/explorer/testdata/namespace/generic_parameter_scope.carbon index ae755162a087..47d14bc8c5a0 100644 --- a/explorer/testdata/namespace/generic_parameter_scope.carbon +++ b/explorer/testdata/namespace/generic_parameter_scope.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/namespace/lookup_scope.carbon b/explorer/testdata/namespace/lookup_scope.carbon index df2699dab138..1163222aaeb2 100644 --- a/explorer/testdata/namespace/lookup_scope.carbon +++ b/explorer/testdata/namespace/lookup_scope.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 6 package ExplorerTest api; diff --git a/explorer/testdata/namespace/members.carbon b/explorer/testdata/namespace/members.carbon index 1be25c2bf541..f9546323e568 100644 --- a/explorer/testdata/namespace/members.carbon +++ b/explorer/testdata/namespace/members.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/operators/add.carbon b/explorer/testdata/operators/add.carbon index 0824fe50ba8e..0851bc1d0b6c 100644 --- a/explorer/testdata/operators/add.carbon +++ b/explorer/testdata/operators/add.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 12 // CHECK:STDOUT: 19 // CHECK:STDOUT: 26 diff --git a/explorer/testdata/operators/add_builtin.carbon b/explorer/testdata/operators/add_builtin.carbon index c3be7accc582..33b57b23a914 100644 --- a/explorer/testdata/operators/add_builtin.carbon +++ b/explorer/testdata/operators/add_builtin.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Interface: 5 // CHECK:STDOUT: Op: 5 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/operators/add_with.carbon b/explorer/testdata/operators/add_with.carbon index dbb303fcf049..7a591a86e5e2 100644 --- a/explorer/testdata/operators/add_with.carbon +++ b/explorer/testdata/operators/add_with.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 6 package ExplorerTest api; diff --git a/explorer/testdata/operators/assign_builtin.carbon b/explorer/testdata/operators/assign_builtin.carbon index 529766c54bbe..ba28dc474e54 100644 --- a/explorer/testdata/operators/assign_builtin.carbon +++ b/explorer/testdata/operators/assign_builtin.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Before: 1 // CHECK:STDOUT: Interface: 2 // CHECK:STDOUT: Op: 3 diff --git a/explorer/testdata/operators/bit_and.carbon b/explorer/testdata/operators/bit_and.carbon index f0ad624f9545..c0fb208ceada 100644 --- a/explorer/testdata/operators/bit_and.carbon +++ b/explorer/testdata/operators/bit_and.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 5 // CHECK:STDOUT: 4 // CHECK:STDOUT: 0 diff --git a/explorer/testdata/operators/bit_complement.carbon b/explorer/testdata/operators/bit_complement.carbon index 380c27510e7d..d15149b1c974 100644 --- a/explorer/testdata/operators/bit_complement.carbon +++ b/explorer/testdata/operators/bit_complement.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: -6 package ExplorerTest api; diff --git a/explorer/testdata/operators/bit_or.carbon b/explorer/testdata/operators/bit_or.carbon index 48d137eeff2c..fa544e937c92 100644 --- a/explorer/testdata/operators/bit_or.carbon +++ b/explorer/testdata/operators/bit_or.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 3 // CHECK:STDOUT: 7 // CHECK:STDOUT: 15 diff --git a/explorer/testdata/operators/bit_xor.carbon b/explorer/testdata/operators/bit_xor.carbon index 9e88b2b3092a..c0c73c8056c8 100644 --- a/explorer/testdata/operators/bit_xor.carbon +++ b/explorer/testdata/operators/bit_xor.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 6 // CHECK:STDOUT: 0 // CHECK:STDOUT: -1 diff --git a/explorer/testdata/operators/bitwise.carbon b/explorer/testdata/operators/bitwise.carbon index 678afed6bb5b..3f9b26c27ef2 100644 --- a/explorer/testdata/operators/bitwise.carbon +++ b/explorer/testdata/operators/bitwise.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/operators/combine.carbon b/explorer/testdata/operators/combine.carbon index c41d88f74f39..5277775d5258 100644 --- a/explorer/testdata/operators/combine.carbon +++ b/explorer/testdata/operators/combine.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/operators/div.carbon b/explorer/testdata/operators/div.carbon index 98c32d455bf7..0d252c14ed58 100644 --- a/explorer/testdata/operators/div.carbon +++ b/explorer/testdata/operators/div.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 6 // CHECK:STDOUT: 3 // CHECK:STDOUT: 1 diff --git a/explorer/testdata/operators/div_builtin.carbon b/explorer/testdata/operators/div_builtin.carbon index e05e561eff91..6efe4d18ce27 100644 --- a/explorer/testdata/operators/div_builtin.carbon +++ b/explorer/testdata/operators/div_builtin.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Interface: 2 // CHECK:STDOUT: Op: 2 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/operators/fail_combine_lhs.carbon b/explorer/testdata/operators/fail_combine_lhs.carbon index 75df629854df..d04878a7bf42 100644 --- a/explorer/testdata/operators/fail_combine_lhs.carbon +++ b/explorer/testdata/operators/fail_combine_lhs.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_combine_lhs.carbon:[[@LINE+1]]: expected a constraint in first operand of `&`, found i32 +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/operators/fail_combine_lhs.carbon:[[@LINE+1]]: expected a constraint in first operand of `&`, found i32 fn F[T:! i32 & type](); fn Main() -> i32 { diff --git a/explorer/testdata/operators/fail_combine_rhs.carbon b/explorer/testdata/operators/fail_combine_rhs.carbon index 742fc0683dab..55eb0cfa84d2 100644 --- a/explorer/testdata/operators/fail_combine_rhs.carbon +++ b/explorer/testdata/operators/fail_combine_rhs.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; class C {} -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_combine_rhs.carbon:[[@LINE+1]]: expected a constraint in second operand of `&`, found class C +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/operators/fail_combine_rhs.carbon:[[@LINE+1]]: expected a constraint in second operand of `&`, found class C fn F[T:! type & C](); fn Main() -> i32 { diff --git a/explorer/testdata/operators/fail_div_by_zero.carbon b/explorer/testdata/operators/fail_div_by_zero.carbon index 4128a5c5a634..cf609fd6d373 100644 --- a/explorer/testdata/operators/fail_div_by_zero.carbon +++ b/explorer/testdata/operators/fail_div_by_zero.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/operators/fail_div_by_zero.carbon:[[@LINE+1]]: division by zero + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/operators/fail_div_by_zero.carbon:[[@LINE+1]]: division by zero var a: auto = 5 / 0; return 0; } diff --git a/explorer/testdata/operators/fail_left_shift_large_rhs.carbon b/explorer/testdata/operators/fail_left_shift_large_rhs.carbon index 841de908605c..4a28d73e9c9e 100644 --- a/explorer/testdata/operators/fail_left_shift_large_rhs.carbon +++ b/explorer/testdata/operators/fail_left_shift_large_rhs.carbon @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} -// CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/data/prelude.carbon:{{.*}}: Integer overflow +// CHECK:STDERR: RUNTIME ERROR: explorer/data/prelude.carbon:{{.*}}: Integer overflow package ExplorerTest api; diff --git a/explorer/testdata/operators/fail_left_shift_negative_rhs.carbon b/explorer/testdata/operators/fail_left_shift_negative_rhs.carbon index 809c25ef73a0..dcec9156f527 100644 --- a/explorer/testdata/operators/fail_left_shift_negative_rhs.carbon +++ b/explorer/testdata/operators/fail_left_shift_negative_rhs.carbon @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} -// CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/data/prelude.carbon:{{.*}}: Integer overflow +// CHECK:STDERR: RUNTIME ERROR: explorer/data/prelude.carbon:{{.*}}: Integer overflow package ExplorerTest api; diff --git a/explorer/testdata/operators/fail_mod_by_zero.carbon b/explorer/testdata/operators/fail_mod_by_zero.carbon index 5b4051c0c408..50b950a35317 100644 --- a/explorer/testdata/operators/fail_mod_by_zero.carbon +++ b/explorer/testdata/operators/fail_mod_by_zero.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/operators/fail_mod_by_zero.carbon:[[@LINE+1]]: division by zero + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/operators/fail_mod_by_zero.carbon:[[@LINE+1]]: division by zero var a: auto = 5 % 0; return 0; } diff --git a/explorer/testdata/operators/fail_no_add.carbon b/explorer/testdata/operators/fail_no_add.carbon index 9275d3f47352..f6f4534972fd 100644 --- a/explorer/testdata/operators/fail_no_add.carbon +++ b/explorer/testdata/operators/fail_no_add.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ class A {} fn Main() -> i32 { var a: A = {}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_no_add.carbon:[[@LINE+2]]: type error in `+`: + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/operators/fail_no_add.carbon:[[@LINE+2]]: type error in `+`: // CHECK:STDERR: could not find implementation of interface AddWith(U = i32) for class A a + 1; return 0; diff --git a/explorer/testdata/operators/fail_no_mul.carbon b/explorer/testdata/operators/fail_no_mul.carbon index db7a9cec8d33..b73d59b8c88f 100644 --- a/explorer/testdata/operators/fail_no_mul.carbon +++ b/explorer/testdata/operators/fail_no_mul.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ class A {} fn Main() -> i32 { var a: A = {}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_no_mul.carbon:[[@LINE+2]]: type error in `*`: + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/operators/fail_no_mul.carbon:[[@LINE+2]]: type error in `*`: // CHECK:STDERR: could not find implementation of interface MulWith(U = i32) for class A a * 1; return 0; diff --git a/explorer/testdata/operators/fail_no_negate.carbon b/explorer/testdata/operators/fail_no_negate.carbon index 503ef31e6621..7242fbfc99a8 100644 --- a/explorer/testdata/operators/fail_no_negate.carbon +++ b/explorer/testdata/operators/fail_no_negate.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ class A {} fn Main() -> i32 { var a: A = {}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_no_negate.carbon:[[@LINE+2]]: type error in `-`: + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/operators/fail_no_negate.carbon:[[@LINE+2]]: type error in `-`: // CHECK:STDERR: could not find implementation of interface Negate for class A -a; return 0; diff --git a/explorer/testdata/operators/fail_no_sub.carbon b/explorer/testdata/operators/fail_no_sub.carbon index 3ea414ac8500..4aa503e380b3 100644 --- a/explorer/testdata/operators/fail_no_sub.carbon +++ b/explorer/testdata/operators/fail_no_sub.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ class A {} fn Main() -> i32 { var a: A = {}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_no_sub.carbon:[[@LINE+2]]: type error in `-`: + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/operators/fail_no_sub.carbon:[[@LINE+2]]: type error in `-`: // CHECK:STDERR: could not find implementation of interface SubWith(U = i32) for class A a - 1; return 0; diff --git a/explorer/testdata/operators/fail_overflow_add.carbon b/explorer/testdata/operators/fail_overflow_add.carbon index b02f636a248c..b4b2a781273a 100644 --- a/explorer/testdata/operators/fail_overflow_add.carbon +++ b/explorer/testdata/operators/fail_overflow_add.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/operators/fail_overflow_add.carbon:[[@LINE+1]]: integer overflow + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/operators/fail_overflow_add.carbon:[[@LINE+1]]: integer overflow var a: auto = 2147483647 + 1; return 0; } diff --git a/explorer/testdata/operators/fail_overflow_div.carbon b/explorer/testdata/operators/fail_overflow_div.carbon index a17bba3c9aa9..eb85868a6bc7 100644 --- a/explorer/testdata/operators/fail_overflow_div.carbon +++ b/explorer/testdata/operators/fail_overflow_div.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/operators/fail_overflow_div.carbon:[[@LINE+1]]: integer overflow + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/operators/fail_overflow_div.carbon:[[@LINE+1]]: integer overflow var a: auto = (-2147483647 -1) /-1; return 0; } diff --git a/explorer/testdata/operators/fail_overflow_multiply.carbon b/explorer/testdata/operators/fail_overflow_multiply.carbon index 6cba1ee1e8e5..048d47ea0b08 100644 --- a/explorer/testdata/operators/fail_overflow_multiply.carbon +++ b/explorer/testdata/operators/fail_overflow_multiply.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/operators/fail_overflow_multiply.carbon:[[@LINE+1]]: integer overflow + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/operators/fail_overflow_multiply.carbon:[[@LINE+1]]: integer overflow var a: auto = 1000000000 * 1000000000; return 0; } diff --git a/explorer/testdata/operators/fail_overflow_sub.carbon b/explorer/testdata/operators/fail_overflow_sub.carbon index be3ce2d6772b..32b239601c39 100644 --- a/explorer/testdata/operators/fail_overflow_sub.carbon +++ b/explorer/testdata/operators/fail_overflow_sub.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/operators/fail_overflow_sub.carbon:[[@LINE+1]]: integer overflow + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/operators/fail_overflow_sub.carbon:[[@LINE+1]]: integer overflow var a: auto = -2147483647 - 2; return 0; } diff --git a/explorer/testdata/operators/fail_right_shift_large_rhs.carbon b/explorer/testdata/operators/fail_right_shift_large_rhs.carbon index e57e807489f0..d242c876f13f 100644 --- a/explorer/testdata/operators/fail_right_shift_large_rhs.carbon +++ b/explorer/testdata/operators/fail_right_shift_large_rhs.carbon @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} -// CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/data/prelude.carbon:{{.*}}: Integer overflow +// CHECK:STDERR: RUNTIME ERROR: explorer/data/prelude.carbon:{{.*}}: Integer overflow package ExplorerTest api; diff --git a/explorer/testdata/operators/fail_right_shift_negative_rhs.carbon b/explorer/testdata/operators/fail_right_shift_negative_rhs.carbon index c255ae53d7d9..47311f506985 100644 --- a/explorer/testdata/operators/fail_right_shift_negative_rhs.carbon +++ b/explorer/testdata/operators/fail_right_shift_negative_rhs.carbon @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} -// CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/data/prelude.carbon:{{.*}}: Integer overflow +// CHECK:STDERR: RUNTIME ERROR: explorer/data/prelude.carbon:{{.*}}: Integer overflow package ExplorerTest api; diff --git a/explorer/testdata/operators/inc_dec.carbon b/explorer/testdata/operators/inc_dec.carbon index e759ff9f87b0..26999f372058 100644 --- a/explorer/testdata/operators/inc_dec.carbon +++ b/explorer/testdata/operators/inc_dec.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 6 // CHECK:STDOUT: 5 // CHECK:STDOUT: 6 diff --git a/explorer/testdata/operators/left_shift.carbon b/explorer/testdata/operators/left_shift.carbon index 5e4dce9803fe..1c5ee373e75c 100644 --- a/explorer/testdata/operators/left_shift.carbon +++ b/explorer/testdata/operators/left_shift.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 10 package ExplorerTest api; diff --git a/explorer/testdata/operators/mod.carbon b/explorer/testdata/operators/mod.carbon index cc7d911235e0..887ac629af9e 100644 --- a/explorer/testdata/operators/mod.carbon +++ b/explorer/testdata/operators/mod.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 7 // CHECK:STDOUT: 3 // CHECK:STDOUT: 0 diff --git a/explorer/testdata/operators/mod_builtin.carbon b/explorer/testdata/operators/mod_builtin.carbon index 459c5ef80779..53fa0abb02aa 100644 --- a/explorer/testdata/operators/mod_builtin.carbon +++ b/explorer/testdata/operators/mod_builtin.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Interface: 2 // CHECK:STDOUT: Op: 2 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/operators/mod_edges.carbon b/explorer/testdata/operators/mod_edges.carbon index 88237395d04c..9e7600afd376 100644 --- a/explorer/testdata/operators/mod_edges.carbon +++ b/explorer/testdata/operators/mod_edges.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/operators/mul.carbon b/explorer/testdata/operators/mul.carbon index c1ae845b1cad..68513990322d 100644 --- a/explorer/testdata/operators/mul.carbon +++ b/explorer/testdata/operators/mul.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 10 // CHECK:STDOUT: 30 // CHECK:STDOUT: 210 diff --git a/explorer/testdata/operators/mul_builtin.carbon b/explorer/testdata/operators/mul_builtin.carbon index 044ecfdf5a3d..38e47515fd3b 100644 --- a/explorer/testdata/operators/mul_builtin.carbon +++ b/explorer/testdata/operators/mul_builtin.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Interface: 6 // CHECK:STDOUT: Op: 6 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/operators/negate.carbon b/explorer/testdata/operators/negate.carbon index a41cdc1c205a..afb19cf6be9f 100644 --- a/explorer/testdata/operators/negate.carbon +++ b/explorer/testdata/operators/negate.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: -5 package ExplorerTest api; diff --git a/explorer/testdata/operators/negate_builtin.carbon b/explorer/testdata/operators/negate_builtin.carbon index afa92d5cfbef..e572e568f077 100644 --- a/explorer/testdata/operators/negate_builtin.carbon +++ b/explorer/testdata/operators/negate_builtin.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Interface: -3 // CHECK:STDOUT: Op: -3 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/operators/right_shift.carbon b/explorer/testdata/operators/right_shift.carbon index 34f576844f03..c9091bbc4bbd 100644 --- a/explorer/testdata/operators/right_shift.carbon +++ b/explorer/testdata/operators/right_shift.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 2 package ExplorerTest api; diff --git a/explorer/testdata/operators/shift.carbon b/explorer/testdata/operators/shift.carbon index 2e62fdaf2128..8269f1145cd7 100644 --- a/explorer/testdata/operators/shift.carbon +++ b/explorer/testdata/operators/shift.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 8 // CHECK:STDOUT: 4 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/operators/shortcircuit_and.carbon b/explorer/testdata/operators/shortcircuit_and.carbon index b7a0ee8a900b..ca2188a107ca 100644 --- a/explorer/testdata/operators/shortcircuit_and.carbon +++ b/explorer/testdata/operators/shortcircuit_and.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/operators/shortcircuit_and_no_shortcircuit.carbon b/explorer/testdata/operators/shortcircuit_and_no_shortcircuit.carbon index 3be15aef3299..d37f614b1de2 100644 --- a/explorer/testdata/operators/shortcircuit_and_no_shortcircuit.carbon +++ b/explorer/testdata/operators/shortcircuit_and_no_shortcircuit.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 2 package ExplorerTest api; diff --git a/explorer/testdata/operators/shortcircuit_or.carbon b/explorer/testdata/operators/shortcircuit_or.carbon index 5d27472e6b72..9808c65b3498 100644 --- a/explorer/testdata/operators/shortcircuit_or.carbon +++ b/explorer/testdata/operators/shortcircuit_or.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/operators/shortcircuit_or_no_shortcircuit.carbon b/explorer/testdata/operators/shortcircuit_or_no_shortcircuit.carbon index 9c03229f000b..13c2bbbd016e 100644 --- a/explorer/testdata/operators/shortcircuit_or_no_shortcircuit.carbon +++ b/explorer/testdata/operators/shortcircuit_or_no_shortcircuit.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 2 package ExplorerTest api; diff --git a/explorer/testdata/operators/sub.carbon b/explorer/testdata/operators/sub.carbon index 1f33cbb0cd88..cd1d458d7d42 100644 --- a/explorer/testdata/operators/sub.carbon +++ b/explorer/testdata/operators/sub.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 4 // CHECK:STDOUT: 3 // CHECK:STDOUT: 2 diff --git a/explorer/testdata/operators/sub_builtin.carbon b/explorer/testdata/operators/sub_builtin.carbon index 8c7fff71d695..3d7e053543b7 100644 --- a/explorer/testdata/operators/sub_builtin.carbon +++ b/explorer/testdata/operators/sub_builtin.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Interface: 5 // CHECK:STDOUT: Op: 5 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/optional/fail_optional_get_empty.carbon b/explorer/testdata/optional/fail_optional_get_empty.carbon index 8bf5dad45f7b..aa9e70b01997 100644 --- a/explorer/testdata/optional/fail_optional_get_empty.carbon +++ b/explorer/testdata/optional/fail_optional_get_empty.carbon @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} -// CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/data/prelude.carbon:{{.*}}: "Attempted to unwrap empty Optional" +// CHECK:STDERR: RUNTIME ERROR: explorer/data/prelude.carbon:{{.*}}: "Attempted to unwrap empty Optional" package ExplorerTest api; diff --git a/explorer/testdata/optional/init_optional_with_non_value.carbon b/explorer/testdata/optional/init_optional_with_non_value.carbon index ed0939490134..92c34d605e83 100644 --- a/explorer/testdata/optional/init_optional_with_non_value.carbon +++ b/explorer/testdata/optional/init_optional_with_non_value.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/optional/init_optional_with_value.carbon b/explorer/testdata/optional/init_optional_with_value.carbon index 6178f3d75558..8461df90d6c4 100644 --- a/explorer/testdata/optional/init_optional_with_value.carbon +++ b/explorer/testdata/optional/init_optional_with_value.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Hallo Welt // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/package/fail_missing.carbon b/explorer/testdata/package/fail_missing.carbon index 70289f2d6e6b..50dddd3ecaf5 100644 --- a/explorer/testdata/package/fail_missing.carbon +++ b/explorer/testdata/package/fail_missing.carbon @@ -3,10 +3,8 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} -// CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/package/fail_missing.carbon:[[@LINE+1]]: syntax error, unexpected FN, expecting PACKAGE +// CHECK:STDERR: SYNTAX ERROR: explorer/testdata/package/fail_missing.carbon:[[@LINE+1]]: syntax error, unexpected FN, expecting PACKAGE fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/package/with_library.carbon b/explorer/testdata/package/with_library.carbon index 816f35f2eb56..7eb3b575d497 100644 --- a/explorer/testdata/package/with_library.carbon +++ b/explorer/testdata/package/with_library.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest library "Foo" api; diff --git a/explorer/testdata/pointer/aliasing.carbon b/explorer/testdata/pointer/aliasing.carbon index 7d81d219a567..c627a981be5c 100644 --- a/explorer/testdata/pointer/aliasing.carbon +++ b/explorer/testdata/pointer/aliasing.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/pointer/basic.carbon b/explorer/testdata/pointer/basic.carbon index bf0d27543104..13b504d5d1ea 100644 --- a/explorer/testdata/pointer/basic.carbon +++ b/explorer/testdata/pointer/basic.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/pointer/fail_delete_uninit.carbon b/explorer/testdata/pointer/fail_delete_uninit.carbon index aff473cfc3a2..cc6b4944ab08 100644 --- a/explorer/testdata/pointer/fail_delete_uninit.carbon +++ b/explorer/testdata/pointer/fail_delete_uninit.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var p: i32*; - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/pointer/fail_delete_uninit.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/pointer/fail_delete_uninit.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> heap.Delete(p); return 0; } diff --git a/explorer/testdata/pointer/fail_intrinsic_delete_no_args.carbon b/explorer/testdata/pointer/fail_intrinsic_delete_no_args.carbon index 3e232c8ee092..c4d13a74f8ed 100644 --- a/explorer/testdata/pointer/fail_intrinsic_delete_no_args.carbon +++ b/explorer/testdata/pointer/fail_intrinsic_delete_no_args.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/pointer/fail_intrinsic_delete_no_args.carbon:[[@LINE+1]]: __intrinsic_delete takes 1 argument + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/pointer/fail_intrinsic_delete_no_args.carbon:[[@LINE+1]]: __intrinsic_delete takes 1 argument __intrinsic_delete(); return 0; } diff --git a/explorer/testdata/pointer/fail_intrinsic_delete_type.carbon b/explorer/testdata/pointer/fail_intrinsic_delete_type.carbon index cd98752808be..4c6229de1475 100644 --- a/explorer/testdata/pointer/fail_intrinsic_delete_type.carbon +++ b/explorer/testdata/pointer/fail_intrinsic_delete_type.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/pointer/fail_intrinsic_delete_type.carbon:[[@LINE+3]]: type error in * + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/pointer/fail_intrinsic_delete_type.carbon:[[@LINE+3]]: type error in * // CHECK:STDERR: expected a pointer type // CHECK:STDERR: actual: i32 __intrinsic_delete(x); diff --git a/explorer/testdata/pointer/fail_intrinsic_new_no_args.carbon b/explorer/testdata/pointer/fail_intrinsic_new_no_args.carbon index 282ee60db46a..c54c20af9119 100644 --- a/explorer/testdata/pointer/fail_intrinsic_new_no_args.carbon +++ b/explorer/testdata/pointer/fail_intrinsic_new_no_args.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/pointer/fail_intrinsic_new_no_args.carbon:[[@LINE+1]]: __intrinsic_new takes 1 argument + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/pointer/fail_intrinsic_new_no_args.carbon:[[@LINE+1]]: __intrinsic_new takes 1 argument __intrinsic_new(); return 0; } diff --git a/explorer/testdata/pointer/fail_invalid_ptr_conversion1.carbon b/explorer/testdata/pointer/fail_invalid_ptr_conversion1.carbon index aadef9cdb7a3..97b85fc534ee 100644 --- a/explorer/testdata/pointer/fail_invalid_ptr_conversion1.carbon +++ b/explorer/testdata/pointer/fail_invalid_ptr_conversion1.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ class A {} fn Main() -> i32 { var a: A = {}; var b: A* = &a; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/pointer/fail_invalid_ptr_conversion1.carbon:[[@LINE+1]]: type error in initializer of variable: 'class A*' is not implicitly convertible to 'i32' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/pointer/fail_invalid_ptr_conversion1.carbon:[[@LINE+1]]: type error in initializer of variable: 'class A*' is not implicitly convertible to 'i32' var c: i32 = b; return 1; } diff --git a/explorer/testdata/pointer/fail_invalid_ptr_conversion2.carbon b/explorer/testdata/pointer/fail_invalid_ptr_conversion2.carbon index 12729ef96723..0bf3d9dfebaf 100644 --- a/explorer/testdata/pointer/fail_invalid_ptr_conversion2.carbon +++ b/explorer/testdata/pointer/fail_invalid_ptr_conversion2.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ class A {} fn Main() -> i32 { var a: i32 = 0; var b: i32* = &a; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/pointer/fail_invalid_ptr_conversion2.carbon:[[@LINE+1]]: type error in initializer of variable: 'i32*' is not implicitly convertible to 'class A*' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/pointer/fail_invalid_ptr_conversion2.carbon:[[@LINE+1]]: type error in initializer of variable: 'i32*' is not implicitly convertible to 'class A*' var c: A* = b; return 1; } diff --git a/explorer/testdata/pointer/fail_rvalue_addressof.carbon b/explorer/testdata/pointer/fail_rvalue_addressof.carbon index 39ee940b1c14..1e53da57e24f 100644 --- a/explorer/testdata/pointer/fail_rvalue_addressof.carbon +++ b/explorer/testdata/pointer/fail_rvalue_addressof.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32 = 5; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/pointer/fail_rvalue_addressof.carbon:[[@LINE+1]]: Argument to & should be a reference expression. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/pointer/fail_rvalue_addressof.carbon:[[@LINE+1]]: Argument to & should be a reference expression. var p: i32* = &5; return 0; } diff --git a/explorer/testdata/pointer/fail_use_after_free.carbon b/explorer/testdata/pointer/fail_use_after_free.carbon index 4b50ac2eb9ae..308d18bf6a3e 100644 --- a/explorer/testdata/pointer/fail_use_after_free.carbon +++ b/explorer/testdata/pointer/fail_use_after_free.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var p: i32* = heap.New(5); heap.Delete(p); - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/pointer/fail_use_after_free.carbon:[[@LINE+1]]: undefined behavior: access to dead value 5 + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/pointer/fail_use_after_free.carbon:[[@LINE+1]]: undefined behavior: access to dead value 5 return *p; } diff --git a/explorer/testdata/pointer/heap_alloc_lifetime.carbon b/explorer/testdata/pointer/heap_alloc_lifetime.carbon index 98f815c4aca4..ac12f8df3992 100644 --- a/explorer/testdata/pointer/heap_alloc_lifetime.carbon +++ b/explorer/testdata/pointer/heap_alloc_lifetime.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/pointer/intrinsic_new.carbon b/explorer/testdata/pointer/intrinsic_new.carbon index 46a09a4729f5..241384329919 100644 --- a/explorer/testdata/pointer/intrinsic_new.carbon +++ b/explorer/testdata/pointer/intrinsic_new.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/pointer/new_and_delete.carbon b/explorer/testdata/pointer/new_and_delete.carbon index e96e48cbec55..a8d7993eb30d 100644 --- a/explorer/testdata/pointer/new_and_delete.carbon +++ b/explorer/testdata/pointer/new_and_delete.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/pointer/new_and_delete_class.carbon b/explorer/testdata/pointer/new_and_delete_class.carbon index 8f6e3da91d3b..44581b8e10ee 100644 --- a/explorer/testdata/pointer/new_and_delete_class.carbon +++ b/explorer/testdata/pointer/new_and_delete_class.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/pointer/new_and_delete_fn.carbon b/explorer/testdata/pointer/new_and_delete_fn.carbon index b20041b6540a..abff72fe64fb 100644 --- a/explorer/testdata/pointer/new_and_delete_fn.carbon +++ b/explorer/testdata/pointer/new_and_delete_fn.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: test // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/pointer/pointer_to_type_like.carbon b/explorer/testdata/pointer/pointer_to_type_like.carbon index d74711cbe8e1..02f48735d392 100644 --- a/explorer/testdata/pointer/pointer_to_type_like.carbon +++ b/explorer/testdata/pointer/pointer_to_type_like.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/pointer/struct_pointer.carbon b/explorer/testdata/pointer/struct_pointer.carbon index 653d21352912..e3cc249967a4 100644 --- a/explorer/testdata/pointer/struct_pointer.carbon +++ b/explorer/testdata/pointer/struct_pointer.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/pointer/tuple_pointer.carbon b/explorer/testdata/pointer/tuple_pointer.carbon index 5b6f9c15d8f3..409b82628c8a 100644 --- a/explorer/testdata/pointer/tuple_pointer.carbon +++ b/explorer/testdata/pointer/tuple_pointer.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 3 // CHECK:STDOUT: 4 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/print/associated_constant.carbon b/explorer/testdata/print/associated_constant.carbon index 99db2bc30b2d..e222e70bcf59 100644 --- a/explorer/testdata/print/associated_constant.carbon +++ b/explorer/testdata/print/associated_constant.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: i32 // CHECK:STDOUT: String // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/print/escaped_brace.carbon b/explorer/testdata/print/escaped_brace.carbon index c9247a922bad..aa9166afdda0 100644 --- a/explorer/testdata/print/escaped_brace.carbon +++ b/explorer/testdata/print/escaped_brace.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Print: {0} // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/print/fail_index_bounds0.carbon b/explorer/testdata/print/fail_index_bounds0.carbon index 647d0bc50ac9..1d7702d78807 100644 --- a/explorer/testdata/print/fail_index_bounds0.carbon +++ b/explorer/testdata/print/fail_index_bounds0.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/print/fail_index_bounds0.carbon:[[@LINE+1]]: Index invalid with argument count of 0 at offset 8 in `Print: {0}` + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/print/fail_index_bounds0.carbon:[[@LINE+1]]: Index invalid with argument count of 0 at offset 8 in `Print: {0}` Print("Print: {0}"); return 0; } diff --git a/explorer/testdata/print/fail_index_bounds1.carbon b/explorer/testdata/print/fail_index_bounds1.carbon index 7d1bfd1f39db..3eaab7f83c62 100644 --- a/explorer/testdata/print/fail_index_bounds1.carbon +++ b/explorer/testdata/print/fail_index_bounds1.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/print/fail_index_bounds1.carbon:[[@LINE+1]]: Index invalid with argument count of 1 at offset 12 in `Print: {0} {1}` + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/print/fail_index_bounds1.carbon:[[@LINE+1]]: Index invalid with argument count of 1 at offset 12 in `Print: {0} {1}` Print("Print: {0} {1}", 1); return 0; } diff --git a/explorer/testdata/print/fail_index_empty.carbon b/explorer/testdata/print/fail_index_empty.carbon index 7e747dc55801..2bc565f3f5b1 100644 --- a/explorer/testdata/print/fail_index_empty.carbon +++ b/explorer/testdata/print/fail_index_empty.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/print/fail_index_empty.carbon:[[@LINE+1]]: Invalid `{}` in `Print: {}` + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/print/fail_index_empty.carbon:[[@LINE+1]]: Invalid `{}` in `Print: {}` Print("Print: {}"); return 0; } diff --git a/explorer/testdata/print/fail_index_incomplete.carbon b/explorer/testdata/print/fail_index_incomplete.carbon index 934ea5c2ddf7..8e23072fa959 100644 --- a/explorer/testdata/print/fail_index_incomplete.carbon +++ b/explorer/testdata/print/fail_index_incomplete.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/print/fail_index_incomplete.carbon:[[@LINE+1]]: Index invalid with argument count of 0 at offset 8 in `Print: {0` + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/print/fail_index_incomplete.carbon:[[@LINE+1]]: Index invalid with argument count of 0 at offset 8 in `Print: {0` Print("Print: {0"); return 0; } diff --git a/explorer/testdata/print/fail_index_limit.carbon b/explorer/testdata/print/fail_index_limit.carbon index 65b323bf74f5..274f0da9e7c7 100644 --- a/explorer/testdata/print/fail_index_limit.carbon +++ b/explorer/testdata/print/fail_index_limit.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/print/fail_index_limit.carbon:[[@LINE+1]]: Index invalid with argument count of 0 at offset 8 in `Print: {2147483648}` + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/print/fail_index_limit.carbon:[[@LINE+1]]: Index invalid with argument count of 0 at offset 8 in `Print: {2147483648}` Print("Print: {2147483648}"); return 0; } diff --git a/explorer/testdata/print/fail_index_negative.carbon b/explorer/testdata/print/fail_index_negative.carbon index bce3098a4b4b..44f5d34a635f 100644 --- a/explorer/testdata/print/fail_index_negative.carbon +++ b/explorer/testdata/print/fail_index_negative.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/print/fail_index_negative.carbon:[[@LINE+1]]: Non-numeric character in index at offset 8 in `Print: {-1}` + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/print/fail_index_negative.carbon:[[@LINE+1]]: Non-numeric character in index at offset 8 in `Print: {-1}` Print("Print: {-1}"); return 0; } diff --git a/explorer/testdata/print/fail_index_text.carbon b/explorer/testdata/print/fail_index_text.carbon index 121b958ecdbd..aedfdf25a9aa 100644 --- a/explorer/testdata/print/fail_index_text.carbon +++ b/explorer/testdata/print/fail_index_text.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/print/fail_index_text.carbon:[[@LINE+1]]: Index invalid with argument count of 0 at offset 8 in `Print: {1a}` + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/print/fail_index_text.carbon:[[@LINE+1]]: Index invalid with argument count of 0 at offset 8 in `Print: {1a}` Print("Print: {1a}"); return 0; } diff --git a/explorer/testdata/print/fail_intrinsic_int_format.carbon b/explorer/testdata/print/fail_intrinsic_int_format.carbon index 4e5e9281f114..2f668992afc8 100644 --- a/explorer/testdata/print/fail_intrinsic_int_format.carbon +++ b/explorer/testdata/print/fail_intrinsic_int_format.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/print/fail_intrinsic_int_format.carbon:[[@LINE+3]]: type error in Print argument 0 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/print/fail_intrinsic_int_format.carbon:[[@LINE+3]]: type error in Print argument 0 // CHECK:STDERR: expected: String // CHECK:STDERR: actual: i32 __intrinsic_print(0); diff --git a/explorer/testdata/print/fail_intrinsic_no_args.carbon b/explorer/testdata/print/fail_intrinsic_no_args.carbon index a0bb11ed0472..b40ad78efb8a 100644 --- a/explorer/testdata/print/fail_intrinsic_no_args.carbon +++ b/explorer/testdata/print/fail_intrinsic_no_args.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/print/fail_intrinsic_no_args.carbon:[[@LINE+1]]: Print takes 1 or 2 arguments, received 0 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/print/fail_intrinsic_no_args.carbon:[[@LINE+1]]: Print takes 1 or 2 arguments, received 0 __intrinsic_print(); } diff --git a/explorer/testdata/print/fail_intrinsic_too_many_args.carbon b/explorer/testdata/print/fail_intrinsic_too_many_args.carbon index 72de47712f77..548c2763b552 100644 --- a/explorer/testdata/print/fail_intrinsic_too_many_args.carbon +++ b/explorer/testdata/print/fail_intrinsic_too_many_args.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/print/fail_intrinsic_too_many_args.carbon:[[@LINE+1]]: Print takes 1 or 2 arguments, received 4 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/print/fail_intrinsic_too_many_args.carbon:[[@LINE+1]]: Print takes 1 or 2 arguments, received 4 __intrinsic_print("", 1, 2, 3); } diff --git a/explorer/testdata/print/fail_intrinsic_type.carbon b/explorer/testdata/print/fail_intrinsic_type.carbon index 50523dbced04..4f33dcdcc806 100644 --- a/explorer/testdata/print/fail_intrinsic_type.carbon +++ b/explorer/testdata/print/fail_intrinsic_type.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/print/fail_intrinsic_type.carbon:[[@LINE+3]]: type error in Print argument 1 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/print/fail_intrinsic_type.carbon:[[@LINE+3]]: type error in Print argument 1 // CHECK:STDERR: expected: i32 // CHECK:STDERR: actual: {.x: i32} __intrinsic_print("{0}", {.x = 1}); diff --git a/explorer/testdata/print/fail_no_args.carbon b/explorer/testdata/print/fail_no_args.carbon index 8357ebb747bf..aada5dc0aeae 100644 --- a/explorer/testdata/print/fail_no_args.carbon +++ b/explorer/testdata/print/fail_no_args.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/print/fail_no_args.carbon:[[@LINE+1]]: Print takes 1 or 2 arguments, received 0 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/print/fail_no_args.carbon:[[@LINE+1]]: Print takes 1 or 2 arguments, received 0 Print(); return 0; } diff --git a/explorer/testdata/print/fail_not_str.carbon b/explorer/testdata/print/fail_not_str.carbon index 3fe7f46b4673..b7b579d43d19 100644 --- a/explorer/testdata/print/fail_not_str.carbon +++ b/explorer/testdata/print/fail_not_str.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/print/fail_not_str.carbon:[[@LINE+3]]: type error in Print argument 0 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/print/fail_not_str.carbon:[[@LINE+3]]: type error in Print argument 0 // CHECK:STDERR: expected: String // CHECK:STDERR: actual: {.x: i32} Print({.x = 1}); diff --git a/explorer/testdata/print/fail_single_brace.carbon b/explorer/testdata/print/fail_single_brace.carbon index 1744604128d0..b4a84d8f2d34 100644 --- a/explorer/testdata/print/fail_single_brace.carbon +++ b/explorer/testdata/print/fail_single_brace.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest impl; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/print/fail_single_brace.carbon:[[@LINE+1]]: `{` must be followed by a second `{` or index in `{` + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/print/fail_single_brace.carbon:[[@LINE+1]]: `{` must be followed by a second `{` or index in `{` Print("{"); return 0; } diff --git a/explorer/testdata/print/fail_too_many_args.carbon b/explorer/testdata/print/fail_too_many_args.carbon index b71f93552fb3..aca9ff254630 100644 --- a/explorer/testdata/print/fail_too_many_args.carbon +++ b/explorer/testdata/print/fail_too_many_args.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/print/fail_too_many_args.carbon:[[@LINE+1]]: Print takes 1 or 2 arguments, received 5 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/print/fail_too_many_args.carbon:[[@LINE+1]]: Print takes 1 or 2 arguments, received 5 Print("too", "many", "args", "to", "print"); return 0; } diff --git a/explorer/testdata/print/fail_type.carbon b/explorer/testdata/print/fail_type.carbon index dddcb8091f60..7e07e47125bd 100644 --- a/explorer/testdata/print/fail_type.carbon +++ b/explorer/testdata/print/fail_type.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/print/fail_type.carbon:[[@LINE+3]]: type error in Print argument 1 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/print/fail_type.carbon:[[@LINE+3]]: type error in Print argument 1 // CHECK:STDERR: expected: i32 // CHECK:STDERR: actual: {.x: i32} Print("{0}", {.x = 1}); diff --git a/explorer/testdata/print/format_only.carbon b/explorer/testdata/print/format_only.carbon index 7895f050884e..34ec55c503da 100644 --- a/explorer/testdata/print/format_only.carbon +++ b/explorer/testdata/print/format_only.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Hello world! // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/print/i32.carbon b/explorer/testdata/print/i32.carbon index e4400e585c5a..857cd144fba8 100644 --- a/explorer/testdata/print/i32.carbon +++ b/explorer/testdata/print/i32.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Printing 1 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/print/long_index.carbon b/explorer/testdata/print/long_index.carbon index 6d2ed2cb610f..710f9f300c2c 100644 --- a/explorer/testdata/print/long_index.carbon +++ b/explorer/testdata/print/long_index.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Printing 1 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/random/fail_empty_range.carbon b/explorer/testdata/random/fail_empty_range.carbon index cf5aabbaec00..17c6d1f7e18a 100644 --- a/explorer/testdata/random/fail_empty_range.carbon +++ b/explorer/testdata/random/fail_empty_range.carbon @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} -// CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/data/prelude.carbon:{{.*}}: Rand inputs must be ordered for a non-empty range: 0 must be less than 0 +// CHECK:STDERR: RUNTIME ERROR: explorer/data/prelude.carbon:{{.*}}: Rand inputs must be ordered for a non-empty range: 0 must be less than 0 package ExplorerTest api; diff --git a/explorer/testdata/random/fail_intrinsic_no_args.carbon b/explorer/testdata/random/fail_intrinsic_no_args.carbon index f44bf5ab68cf..9c74b1a10adf 100644 --- a/explorer/testdata/random/fail_intrinsic_no_args.carbon +++ b/explorer/testdata/random/fail_intrinsic_no_args.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/random/fail_intrinsic_no_args.carbon:[[@LINE+1]]: Rand takes 2 arguments, received 0 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/random/fail_intrinsic_no_args.carbon:[[@LINE+1]]: Rand takes 2 arguments, received 0 __intrinsic_rand(); return 0; } diff --git a/explorer/testdata/random/fail_intrinsic_type0.carbon b/explorer/testdata/random/fail_intrinsic_type0.carbon index 3d6bd5adc782..df31b5b5c65e 100644 --- a/explorer/testdata/random/fail_intrinsic_type0.carbon +++ b/explorer/testdata/random/fail_intrinsic_type0.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/random/fail_intrinsic_type0.carbon:[[@LINE+3]]: type error in Rand argument 0 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/random/fail_intrinsic_type0.carbon:[[@LINE+3]]: type error in Rand argument 0 // CHECK:STDERR: expected: i32 // CHECK:STDERR: actual: String __intrinsic_rand("a", 1); diff --git a/explorer/testdata/random/fail_intrinsic_type1.carbon b/explorer/testdata/random/fail_intrinsic_type1.carbon index 1c7c36750195..82e0db3cfa7d 100644 --- a/explorer/testdata/random/fail_intrinsic_type1.carbon +++ b/explorer/testdata/random/fail_intrinsic_type1.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/random/fail_intrinsic_type1.carbon:[[@LINE+3]]: type error in Rand argument 1 + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/random/fail_intrinsic_type1.carbon:[[@LINE+3]]: type error in Rand argument 1 // CHECK:STDERR: expected: i32 // CHECK:STDERR: actual: String __intrinsic_rand(1, "a"); diff --git a/explorer/testdata/random/fail_reverse_range.carbon b/explorer/testdata/random/fail_reverse_range.carbon index fa81b37d2e8b..cd90b7e3c295 100644 --- a/explorer/testdata/random/fail_reverse_range.carbon +++ b/explorer/testdata/random/fail_reverse_range.carbon @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} -// CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/data/prelude.carbon:{{.*}}: Rand inputs must be ordered for a non-empty range: 1 must be less than -1 +// CHECK:STDERR: RUNTIME ERROR: explorer/data/prelude.carbon:{{.*}}: Rand inputs must be ordered for a non-empty range: 1 must be less than -1 package ExplorerTest api; diff --git a/explorer/testdata/random/max_range.carbon b/explorer/testdata/random/max_range.carbon index ca1df3749f93..aec7e67f2509 100644 --- a/explorer/testdata/random/max_range.carbon +++ b/explorer/testdata/random/max_range.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/random/random.carbon b/explorer/testdata/random/random.carbon index 2c01b3772bba..898d8f5553a1 100644 --- a/explorer/testdata/random/random.carbon +++ b/explorer/testdata/random/random.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Nice! // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/return/convert_return_value.carbon b/explorer/testdata/return/convert_return_value.carbon index 8ace4732f3a2..04efb76fcc80 100644 --- a/explorer/testdata/return/convert_return_value.carbon +++ b/explorer/testdata/return/convert_return_value.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 42 package ExplorerTest api; diff --git a/explorer/testdata/return/explicit_empty.carbon b/explorer/testdata/return/explicit_empty.carbon index f0461c283786..98153af8f997 100644 --- a/explorer/testdata/return/explicit_empty.carbon +++ b/explorer/testdata/return/explicit_empty.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/return/fail_explicit_with_no_return.carbon b/explorer/testdata/return/fail_explicit_with_no_return.carbon index bbbad92d9ce7..4628eb41de58 100644 --- a/explorer/testdata/return/fail_explicit_with_no_return.carbon +++ b/explorer/testdata/return/fail_explicit_with_no_return.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn F() -> () { -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/return/fail_explicit_with_no_return.carbon:[[@LINE+1]]: control-flow reaches end of function that provides a `->` return type without reaching a return statement +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/return/fail_explicit_with_no_return.carbon:[[@LINE+1]]: control-flow reaches end of function that provides a `->` return type without reaching a return statement } fn Main() -> i32 { diff --git a/explorer/testdata/return/fail_explicit_with_plain_return.carbon b/explorer/testdata/return/fail_explicit_with_plain_return.carbon index d3192e3954ad..0aee09373c39 100644 --- a/explorer/testdata/return/fail_explicit_with_plain_return.carbon +++ b/explorer/testdata/return/fail_explicit_with_plain_return.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn F() -> () { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/return/fail_explicit_with_plain_return.carbon:[[@LINE+1]]: return; should provide a return value, to match the function's signature. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/return/fail_explicit_with_plain_return.carbon:[[@LINE+1]]: return; should provide a return value, to match the function's signature. return; } diff --git a/explorer/testdata/return/fail_implicit_with_explicit_return.carbon b/explorer/testdata/return/fail_implicit_with_explicit_return.carbon index a0bf3040c62b..79c962888d49 100644 --- a/explorer/testdata/return/fail_implicit_with_explicit_return.carbon +++ b/explorer/testdata/return/fail_implicit_with_explicit_return.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn F() { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/return/fail_implicit_with_explicit_return.carbon:[[@LINE+1]]: return (); should not provide a return value, to match the function's signature. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/return/fail_implicit_with_explicit_return.carbon:[[@LINE+1]]: return (); should not provide a return value, to match the function's signature. return (); } diff --git a/explorer/testdata/return/implicit_with_no_return.carbon b/explorer/testdata/return/implicit_with_no_return.carbon index 70f834c226b8..4a827072dc2a 100644 --- a/explorer/testdata/return/implicit_with_no_return.carbon +++ b/explorer/testdata/return/implicit_with_no_return.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/return/implicit_with_plain_return.carbon b/explorer/testdata/return/implicit_with_plain_return.carbon index 8bded969d09e..4b77def8ecdb 100644 --- a/explorer/testdata/return/implicit_with_plain_return.carbon +++ b/explorer/testdata/return/implicit_with_plain_return.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/basic.carbon b/explorer/testdata/string/basic.carbon index 136cbde740b6..ae11a1158693 100644 --- a/explorer/testdata/string/basic.carbon +++ b/explorer/testdata/string/basic.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/block.carbon b/explorer/testdata/string/block.carbon index 79ec971dcfef..4a3436edd4d7 100644 --- a/explorer/testdata/string/block.carbon +++ b/explorer/testdata/string/block.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/block_escaped_triple_quotes.carbon b/explorer/testdata/string/block_escaped_triple_quotes.carbon index 327948aa47f9..537a87509a15 100644 --- a/explorer/testdata/string/block_escaped_triple_quotes.carbon +++ b/explorer/testdata/string/block_escaped_triple_quotes.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/block_file_type_indicator.carbon b/explorer/testdata/string/block_file_type_indicator.carbon index 07ac92d339be..b59c05993cbe 100644 --- a/explorer/testdata/string/block_file_type_indicator.carbon +++ b/explorer/testdata/string/block_file_type_indicator.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/fail_block_quotes_not_on_own_line.carbon b/explorer/testdata/string/fail_block_quotes_not_on_own_line.carbon index 7835639c513a..b83605f93dc0 100644 --- a/explorer/testdata/string/fail_block_quotes_not_on_own_line.carbon +++ b/explorer/testdata/string/fail_block_quotes_not_on_own_line.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_block_quotes_not_on_own_line.carbon:[[@LINE+1]]: Invalid block string: Should end with triple quotes: error: closing ''' + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_block_quotes_not_on_own_line.carbon:[[@LINE+1]]: Invalid block string: Should end with triple quotes: error: closing ''' var s: String = ''' error: closing ''' is not on its own line. '''; diff --git a/explorer/testdata/string/fail_hex_lower.carbon b/explorer/testdata/string/fail_hex_lower.carbon index 7c431c25827b..2d358fc30fce 100644 --- a/explorer/testdata/string/fail_hex_lower.carbon +++ b/explorer/testdata/string/fail_hex_lower.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_hex_lower.carbon:[[@LINE+1]]: Invalid escaping in string: "str\xaa" + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_hex_lower.carbon:[[@LINE+1]]: Invalid escaping in string: "str\xaa" Print("str\xaa"); return 0; } diff --git a/explorer/testdata/string/fail_hex_truncated.carbon b/explorer/testdata/string/fail_hex_truncated.carbon index b005de934b98..e05fb935ce43 100644 --- a/explorer/testdata/string/fail_hex_truncated.carbon +++ b/explorer/testdata/string/fail_hex_truncated.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_hex_truncated.carbon:[[@LINE+1]]: Invalid escaping in string: "str\x" + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_hex_truncated.carbon:[[@LINE+1]]: Invalid escaping in string: "str\x" Print("str\x"); return 0; } diff --git a/explorer/testdata/string/fail_invalid_escape.carbon b/explorer/testdata/string/fail_invalid_escape.carbon index 33c2a963c9e6..f36140407b0d 100644 --- a/explorer/testdata/string/fail_invalid_escape.carbon +++ b/explorer/testdata/string/fail_invalid_escape.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_invalid_escape.carbon:[[@LINE+1]]: Invalid escaping in string: "str\e" + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_invalid_escape.carbon:[[@LINE+1]]: Invalid escaping in string: "str\e" Print("str\e"); return 0; } diff --git a/explorer/testdata/string/fail_newline.carbon b/explorer/testdata/string/fail_newline.carbon index 66c00629db3d..4b1075b632e5 100644 --- a/explorer/testdata/string/fail_newline.carbon +++ b/explorer/testdata/string/fail_newline.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_newline.carbon:[[@LINE+2]]: missing closing quote in single-line string: "new + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_newline.carbon:[[@LINE+2]]: missing closing quote in single-line string: "new // CHECK:STDERR: Print("new line"); diff --git a/explorer/testdata/string/fail_octal.carbon b/explorer/testdata/string/fail_octal.carbon index 3a4123af87b4..5d91cede8dc2 100644 --- a/explorer/testdata/string/fail_octal.carbon +++ b/explorer/testdata/string/fail_octal.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_octal.carbon:[[@LINE+1]]: Invalid escaping in string: "str\01" + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_octal.carbon:[[@LINE+1]]: Invalid escaping in string: "str\01" Print("str\01"); return 0; } diff --git a/explorer/testdata/string/fail_raw_block_more_hash_tags_on_left.carbon b/explorer/testdata/string/fail_raw_block_more_hash_tags_on_left.carbon index ed6e3a524955..9afbffd9c199 100644 --- a/explorer/testdata/string/fail_raw_block_more_hash_tags_on_left.carbon +++ b/explorer/testdata/string/fail_raw_block_more_hash_tags_on_left.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_raw_block_more_hash_tags_on_left.carbon:[[@LINE+1]]: Unexpected end of file + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_raw_block_more_hash_tags_on_left.carbon:[[@LINE+1]]: Unexpected end of file var s: String = ##''' error: there are more #s on the left than the right. '''#; diff --git a/explorer/testdata/string/fail_raw_block_more_hash_tags_on_right.carbon b/explorer/testdata/string/fail_raw_block_more_hash_tags_on_right.carbon index d1f608522a08..45de606b26b8 100644 --- a/explorer/testdata/string/fail_raw_block_more_hash_tags_on_right.carbon +++ b/explorer/testdata/string/fail_raw_block_more_hash_tags_on_right.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_raw_block_more_hash_tags_on_right.carbon:[[@LINE+1]]: invalid character '\x23' in source file. + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_raw_block_more_hash_tags_on_right.carbon:[[@LINE+1]]: invalid character '\x23' in source file. var s: String = #''' error: there are more #s on the right than the left. '''##; diff --git a/explorer/testdata/string/fail_raw_block_quotes_not_on_own_line.carbon b/explorer/testdata/string/fail_raw_block_quotes_not_on_own_line.carbon index 572b0d3a4620..191944b79823 100644 --- a/explorer/testdata/string/fail_raw_block_quotes_not_on_own_line.carbon +++ b/explorer/testdata/string/fail_raw_block_quotes_not_on_own_line.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_raw_block_quotes_not_on_own_line.carbon:[[@LINE+1]]: Invalid block string: Should end with triple quotes: error: closing ''' + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_raw_block_quotes_not_on_own_line.carbon:[[@LINE+1]]: Invalid block string: Should end with triple quotes: error: closing ''' var s: String = #''' error: closing '''# is not on its own line. '''#; diff --git a/explorer/testdata/string/fail_raw_block_single_line.carbon b/explorer/testdata/string/fail_raw_block_single_line.carbon index d61ead0294ff..56564514e5bc 100644 --- a/explorer/testdata/string/fail_raw_block_single_line.carbon +++ b/explorer/testdata/string/fail_raw_block_single_line.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn CompareStr(s: String) -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_raw_block_single_line.carbon:[[@LINE+1]]: Invalid block string: Too few lines + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_raw_block_single_line.carbon:[[@LINE+1]]: Invalid block string: Too few lines if (s == #'''raw string literal starting with '''#) { return 0; } diff --git a/explorer/testdata/string/fail_raw_more_hash_tags_on_left.carbon b/explorer/testdata/string/fail_raw_more_hash_tags_on_left.carbon index 1e0023af26b5..1bb1cf30035f 100644 --- a/explorer/testdata/string/fail_raw_more_hash_tags_on_left.carbon +++ b/explorer/testdata/string/fail_raw_more_hash_tags_on_left.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn CompareStr(s: String) -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_raw_more_hash_tags_on_left.carbon:[[@LINE+2]]: missing closing quote in single-line string: ##"str"#) { + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_raw_more_hash_tags_on_left.carbon:[[@LINE+2]]: missing closing quote in single-line string: ##"str"#) { // CHECK:STDERR: if (s == ##"str"#) { return 0; diff --git a/explorer/testdata/string/fail_raw_more_hash_tags_on_right.carbon b/explorer/testdata/string/fail_raw_more_hash_tags_on_right.carbon index 759b788ccd8a..664385413681 100644 --- a/explorer/testdata/string/fail_raw_more_hash_tags_on_right.carbon +++ b/explorer/testdata/string/fail_raw_more_hash_tags_on_right.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn CompareStr(s: String) -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_raw_more_hash_tags_on_right.carbon:[[@LINE+1]]: invalid character '\x23' in source file. + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_raw_more_hash_tags_on_right.carbon:[[@LINE+1]]: invalid character '\x23' in source file. if (s == "str"#) { return 0; } diff --git a/explorer/testdata/string/fail_tab.carbon b/explorer/testdata/string/fail_tab.carbon index d6e65af93df5..b541fa84650e 100644 --- a/explorer/testdata/string/fail_tab.carbon +++ b/explorer/testdata/string/fail_tab.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/string/fail_tab.carbon:[[@LINE+1]]: Invalid escaping in string: "new line" + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/string/fail_tab.carbon:[[@LINE+1]]: Invalid escaping in string: "new line" Print("new line"); return 0; } diff --git a/explorer/testdata/string/hex.carbon b/explorer/testdata/string/hex.carbon index 6027f397cdcb..bba45c3d6211 100644 --- a/explorer/testdata/string/hex.carbon +++ b/explorer/testdata/string/hex.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/newline.carbon b/explorer/testdata/string/newline.carbon index ce36c51a411f..17dad87b1779 100644 --- a/explorer/testdata/string/newline.carbon +++ b/explorer/testdata/string/newline.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/raw_basic.carbon b/explorer/testdata/string/raw_basic.carbon index f6c0bb17b730..d8a1fb36043a 100644 --- a/explorer/testdata/string/raw_basic.carbon +++ b/explorer/testdata/string/raw_basic.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/raw_basic_multi_hashtag.carbon b/explorer/testdata/string/raw_basic_multi_hashtag.carbon index 6b0e67200c96..ad06d1e3be4f 100644 --- a/explorer/testdata/string/raw_basic_multi_hashtag.carbon +++ b/explorer/testdata/string/raw_basic_multi_hashtag.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/raw_block.carbon b/explorer/testdata/string/raw_block.carbon index c24a85dea9c2..9a3939c85955 100644 --- a/explorer/testdata/string/raw_block.carbon +++ b/explorer/testdata/string/raw_block.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/raw_block_escaped_back_slash.carbon b/explorer/testdata/string/raw_block_escaped_back_slash.carbon index da058481c254..10abd7a8c696 100644 --- a/explorer/testdata/string/raw_block_escaped_back_slash.carbon +++ b/explorer/testdata/string/raw_block_escaped_back_slash.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/raw_block_escaped_triple_quotes.carbon b/explorer/testdata/string/raw_block_escaped_triple_quotes.carbon index 0079abfef306..f4f4cf654b19 100644 --- a/explorer/testdata/string/raw_block_escaped_triple_quotes.carbon +++ b/explorer/testdata/string/raw_block_escaped_triple_quotes.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/raw_nesting.carbon b/explorer/testdata/string/raw_nesting.carbon index c5ac6afef68c..b4f406503629 100644 --- a/explorer/testdata/string/raw_nesting.carbon +++ b/explorer/testdata/string/raw_nesting.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/string/unicode.carbon b/explorer/testdata/string/unicode.carbon index 8663b076437e..b046cb26ce4e 100644 --- a/explorer/testdata/string/unicode.carbon +++ b/explorer/testdata/string/unicode.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/struct/assign.carbon b/explorer/testdata/struct/assign.carbon index e310af8ca076..40ab040aecea 100644 --- a/explorer/testdata/struct/assign.carbon +++ b/explorer/testdata/struct/assign.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/struct/assign_member.carbon b/explorer/testdata/struct/assign_member.carbon index 8648cac5d922..acd167e306ca 100644 --- a/explorer/testdata/struct/assign_member.carbon +++ b/explorer/testdata/struct/assign_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/struct/empty.carbon b/explorer/testdata/struct/empty.carbon index e21daa50fa0b..457f8133f871 100644 --- a/explorer/testdata/struct/empty.carbon +++ b/explorer/testdata/struct/empty.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/struct/ending_comma.carbon b/explorer/testdata/struct/ending_comma.carbon index 0fec290cf012..64456c8e4eba 100644 --- a/explorer/testdata/struct/ending_comma.carbon +++ b/explorer/testdata/struct/ending_comma.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/struct/equality.carbon b/explorer/testdata/struct/equality.carbon index 43c388cb098c..fc5d81a52fa1 100644 --- a/explorer/testdata/struct/equality.carbon +++ b/explorer/testdata/struct/equality.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: t1 == t2: 1 // CHECK:STDOUT: t1 != t2: 0 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/struct/equality_false.carbon b/explorer/testdata/struct/equality_false.carbon index 961e48ee3ca4..536fb7f16c10 100644 --- a/explorer/testdata/struct/equality_false.carbon +++ b/explorer/testdata/struct/equality_false.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/struct/fail_assign_different_types.carbon b/explorer/testdata/struct/fail_assign_different_types.carbon index 27f59a1c75b8..5741052a91e3 100644 --- a/explorer/testdata/struct/fail_assign_different_types.carbon +++ b/explorer/testdata/struct/fail_assign_different_types.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var p: auto = {.x = 0, .y = 0}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/struct/fail_assign_different_types.carbon:[[@LINE+1]]: could not find implementation of interface AssignWith(U = {.y: i32}) for {.x: i32, .y: i32} + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/struct/fail_assign_different_types.carbon:[[@LINE+1]]: could not find implementation of interface AssignWith(U = {.y: i32}) for {.x: i32, .y: i32} p = {.y = 0}; return 0; } diff --git a/explorer/testdata/struct/fail_equality_type.carbon b/explorer/testdata/struct/fail_equality_type.carbon index 642bb9f379dc..0f257bd9e146 100644 --- a/explorer/testdata/struct/fail_equality_type.carbon +++ b/explorer/testdata/struct/fail_equality_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -21,7 +19,7 @@ external impl {.x: i32, .y: i32} as EqWith(Self) { fn Main() -> i32 { var t1: {.x: i32, .y: i32} = {.x = 5, .y = 2}; var t2: {.x: i32,} = {.x = 5,}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/struct/fail_equality_type.carbon:[[@LINE+1]]: {.x: i32, .y: i32} is not equality comparable with {.x: i32} (could not find implementation of interface EqWith(U = {.x: i32}) for {.x: i32, .y: i32}) + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/struct/fail_equality_type.carbon:[[@LINE+1]]: {.x: i32, .y: i32} is not equality comparable with {.x: i32} (could not find implementation of interface EqWith(U = {.x: i32}) for {.x: i32, .y: i32}) if (t1 == t2) { return 1; } else { diff --git a/explorer/testdata/struct/fail_field_access_mismatch.carbon b/explorer/testdata/struct/fail_field_access_mismatch.carbon index 70b5954d8f05..e9008f5be06f 100644 --- a/explorer/testdata/struct/fail_field_access_mismatch.carbon +++ b/explorer/testdata/struct/fail_field_access_mismatch.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/struct/fail_field_access_mismatch.carbon:[[@LINE+1]]: struct {.x: i32, .y: i32} does not have a field named z + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/struct/fail_field_access_mismatch.carbon:[[@LINE+1]]: struct {.x: i32, .y: i32} does not have a field named z return {.x = 1, .y = 2}.z - 1; } diff --git a/explorer/testdata/struct/fail_struct_literal_duplicate_member.carbon b/explorer/testdata/struct/fail_struct_literal_duplicate_member.carbon index 00d68caf137b..adf9f55e1f32 100644 --- a/explorer/testdata/struct/fail_struct_literal_duplicate_member.carbon +++ b/explorer/testdata/struct/fail_struct_literal_duplicate_member.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/struct/fail_struct_literal_duplicate_member.carbon:[[@LINE+1]]: Duplicate name `x` in struct literal + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/struct/fail_struct_literal_duplicate_member.carbon:[[@LINE+1]]: Duplicate name `x` in struct literal var x: auto = {.x = 0, .x = 0}; return 0; } diff --git a/explorer/testdata/struct/fail_struct_type_literal_duplicate_member.carbon b/explorer/testdata/struct/fail_struct_type_literal_duplicate_member.carbon index c4d105204ec5..c4674f3fc873 100644 --- a/explorer/testdata/struct/fail_struct_type_literal_duplicate_member.carbon +++ b/explorer/testdata/struct/fail_struct_type_literal_duplicate_member.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/struct/fail_struct_type_literal_duplicate_member.carbon:[[@LINE+1]]: Duplicate name `x` in struct type literal + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/struct/fail_struct_type_literal_duplicate_member.carbon:[[@LINE+1]]: Duplicate name `x` in struct type literal var y: {.x: i32, .x: i32}; return 0; } diff --git a/explorer/testdata/struct/field_convertible_to_type.carbon b/explorer/testdata/struct/field_convertible_to_type.carbon index 009d42b6c37c..22752cd3c5e1 100644 --- a/explorer/testdata/struct/field_convertible_to_type.carbon +++ b/explorer/testdata/struct/field_convertible_to_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/struct/name_order.carbon b/explorer/testdata/struct/name_order.carbon index ffc8b7d9c0b4..adfacc359f3c 100644 --- a/explorer/testdata/struct/name_order.carbon +++ b/explorer/testdata/struct/name_order.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/struct/temp.carbon b/explorer/testdata/struct/temp.carbon index b7d9ed2b2737..c92ab6a0b34e 100644 --- a/explorer/testdata/struct/temp.carbon +++ b/explorer/testdata/struct/temp.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/struct/var.carbon b/explorer/testdata/struct/var.carbon index 9fcc58642ab9..8142ccd4709d 100644 --- a/explorer/testdata/struct/var.carbon +++ b/explorer/testdata/struct/var.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/template/fail_name_lookup.carbon b/explorer/testdata/template/fail_name_lookup.carbon index 6a06218e5771..4b4faa96a169 100644 --- a/explorer/testdata/template/fail_name_lookup.carbon +++ b/explorer/testdata/template/fail_name_lookup.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -19,7 +17,7 @@ interface HasF { impl forall [template T:! HasF] T as CallF { // TODO: This case should be accepted, using `ClassWithExternalF.(HasF.F)`. // TODO: The other case should be rejected due to ambiguity. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/template/fail_name_lookup.carbon:[[@LINE+1]]: class ClassWithExternalF does not have a field named F + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/template/fail_name_lookup.carbon:[[@LINE+1]]: class ClassWithExternalF does not have a field named F fn DoIt[self: Self]() { self.F(); } } diff --git a/explorer/testdata/template/fail_no_member.carbon b/explorer/testdata/template/fail_no_member.carbon index cd63b893917f..9a55b443a27b 100644 --- a/explorer/testdata/template/fail_no_member.carbon +++ b/explorer/testdata/template/fail_no_member.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ interface GetX { } impl forall [template T:! type] T as GetX { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/template/fail_no_member.carbon:[[@LINE+1]]: member access, unexpected i32 in self.x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/template/fail_no_member.carbon:[[@LINE+1]]: member access, unexpected i32 in self.x fn DoIt[self: Self]() -> i32 { return self.x; } } diff --git a/explorer/testdata/template/member_access.carbon b/explorer/testdata/template/member_access.carbon index 8e58bdd65f17..0b8223a22359 100644 --- a/explorer/testdata/template/member_access.carbon +++ b/explorer/testdata/template/member_access.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 1 // CHECK:STDOUT: 3 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/template/name_lookup.carbon b/explorer/testdata/template/name_lookup.carbon index c7c9c171a795..bf7e27fe4c05 100644 --- a/explorer/testdata/template/name_lookup.carbon +++ b/explorer/testdata/template/name_lookup.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: MemberF.F // CHECK:STDOUT: ImplF.(HasF.F) // CHECK:STDOUT: BothFs.(HasF.F) diff --git a/explorer/testdata/tuple/convert.carbon b/explorer/testdata/tuple/convert.carbon index 14e8d7ff22de..48e6125a20ef 100644 --- a/explorer/testdata/tuple/convert.carbon +++ b/explorer/testdata/tuple/convert.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: 2 // CHECK:STDOUT: 3 // CHECK:STDOUT: 4 diff --git a/explorer/testdata/tuple/ending_comma.carbon b/explorer/testdata/tuple/ending_comma.carbon index 589e1cb88bc4..c4c1dd904a76 100644 --- a/explorer/testdata/tuple/ending_comma.carbon +++ b/explorer/testdata/tuple/ending_comma.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/tuple/equality.carbon b/explorer/testdata/tuple/equality.carbon index 9fc8216520a8..34a51d835503 100644 --- a/explorer/testdata/tuple/equality.carbon +++ b/explorer/testdata/tuple/equality.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/tuple/equality_false.carbon b/explorer/testdata/tuple/equality_false.carbon index 03068e1fc377..d954bc4d8a9e 100644 --- a/explorer/testdata/tuple/equality_false.carbon +++ b/explorer/testdata/tuple/equality_false.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/tuple/fail_equality_type.carbon b/explorer/testdata/tuple/fail_equality_type.carbon index 7a46e51ed710..37fa704d9b47 100644 --- a/explorer/testdata/tuple/fail_equality_type.carbon +++ b/explorer/testdata/tuple/fail_equality_type.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var t1: (i32, i32) = (5, 2); var t2: (i32,) = (5,); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/tuple/fail_equality_type.carbon:[[@LINE+1]]: (i32, i32) is not equality comparable with (i32,) (could not find implementation of interface EqWith(U = (i32,)) for (i32, i32)) + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/tuple/fail_equality_type.carbon:[[@LINE+1]]: (i32, i32) is not equality comparable with (i32,) (could not find implementation of interface EqWith(U = (i32,)) for (i32, i32)) if (t1 == t2) { return 1; } else { diff --git a/explorer/testdata/tuple/fail_implicit_convert_with_as.carbon b/explorer/testdata/tuple/fail_implicit_convert_with_as.carbon index b1e2d19ab561..6178d3ba6bdd 100644 --- a/explorer/testdata/tuple/fail_implicit_convert_with_as.carbon +++ b/explorer/testdata/tuple/fail_implicit_convert_with_as.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -21,7 +19,7 @@ external impl A as As(B) { fn Main() -> i32 { var a: (i32, A) = (1, {.a = 2}); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/tuple/fail_implicit_convert_with_as.carbon:[[@LINE+1]]: type error in initializer of variable: '(i32, class A)' is not implicitly convertible to '(i32, class B)' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/tuple/fail_implicit_convert_with_as.carbon:[[@LINE+1]]: type error in initializer of variable: '(i32, class A)' is not implicitly convertible to '(i32, class B)' var b: (i32, B) = a; return b[1].b; } diff --git a/explorer/testdata/tuple/fail_index.carbon b/explorer/testdata/tuple/fail_index.carbon index d7cfa7fc878d..296e1ee61658 100644 --- a/explorer/testdata/tuple/fail_index.carbon +++ b/explorer/testdata/tuple/fail_index.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: auto = (0, 1); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/tuple/fail_index.carbon:[[@LINE+1]]: index 2 is out of range for type (i32, i32) + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/tuple/fail_index.carbon:[[@LINE+1]]: index 2 is out of range for type (i32, i32) return x[2]; } diff --git a/explorer/testdata/tuple/fail_index_var.carbon b/explorer/testdata/tuple/fail_index_var.carbon index 3b39c170eb08..9df2fd737b7e 100644 --- a/explorer/testdata/tuple/fail_index_var.carbon +++ b/explorer/testdata/tuple/fail_index_var.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: auto = (0, 1); var index: i32 = 0; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/tuple/fail_index_var.carbon:[[@LINE+1]]: could not find `index: i32` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/tuple/fail_index_var.carbon:[[@LINE+1]]: could not find `index: i32` return x[index]; } diff --git a/explorer/testdata/tuple/fail_length_mismatch_with_auto.carbon b/explorer/testdata/tuple/fail_length_mismatch_with_auto.carbon index 91545f31a597..54faa1681cc5 100644 --- a/explorer/testdata/tuple/fail_length_mismatch_with_auto.carbon +++ b/explorer/testdata/tuple/fail_length_mismatch_with_auto.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/tuple/fail_length_mismatch_with_auto.carbon:[[@LINE+1]]: tuples of different length + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/tuple/fail_length_mismatch_with_auto.carbon:[[@LINE+1]]: tuples of different length var a: (auto,) = (1, 2); return 0; } diff --git a/explorer/testdata/tuple/fail_nontype_tuple_as_type.carbon b/explorer/testdata/tuple/fail_nontype_tuple_as_type.carbon index 80646153b43f..41304af717ba 100644 --- a/explorer/testdata/tuple/fail_nontype_tuple_as_type.carbon +++ b/explorer/testdata/tuple/fail_nontype_tuple_as_type.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/tuple/fail_nontype_tuple_as_type.carbon:[[@LINE+1]]: type error in type of name binding: '(i32, i32)' is not implicitly convertible to 'type' +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/tuple/fail_nontype_tuple_as_type.carbon:[[@LINE+1]]: type error in type of name binding: '(i32, i32)' is not implicitly convertible to 'type' fn F[T:! (i32, i32)](x: T); fn Main() -> i32; diff --git a/explorer/testdata/tuple/fail_to_array.carbon b/explorer/testdata/tuple/fail_to_array.carbon index 381f3e3b10f5..1e08c13d64e1 100644 --- a/explorer/testdata/tuple/fail_to_array.carbon +++ b/explorer/testdata/tuple/fail_to_array.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var t: auto = (1, 2); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/tuple/fail_to_array.carbon:[[@LINE+1]]: type error in initializer of variable: '(i32, i32)' is not implicitly convertible to '[i32; 3]' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/tuple/fail_to_array.carbon:[[@LINE+1]]: type error in initializer of variable: '(i32, i32)' is not implicitly convertible to '[i32; 3]' var a: [i32; 3] = t; } diff --git a/explorer/testdata/tuple/fail_type_tuple_as_type.carbon b/explorer/testdata/tuple/fail_type_tuple_as_type.carbon index 188e07114530..8b1946348e7e 100644 --- a/explorer/testdata/tuple/fail_type_tuple_as_type.carbon +++ b/explorer/testdata/tuple/fail_type_tuple_as_type.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn F[T:! ((), ())](x: T) -> () { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/tuple/fail_type_tuple_as_type.carbon:[[@LINE+1]]: only arrays and tuples can be indexed, found T + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/tuple/fail_type_tuple_as_type.carbon:[[@LINE+1]]: only arrays and tuples can be indexed, found T return x[0]; } diff --git a/explorer/testdata/tuple/fail_unexpected_tuple.carbon b/explorer/testdata/tuple/fail_unexpected_tuple.carbon index 58dd3e9f2601..3d8b55f85bc8 100644 --- a/explorer/testdata/tuple/fail_unexpected_tuple.carbon +++ b/explorer/testdata/tuple/fail_unexpected_tuple.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/tuple/fail_unexpected_tuple.carbon:[[@LINE+1]]: didn't expect a tuple + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/tuple/fail_unexpected_tuple.carbon:[[@LINE+1]]: didn't expect a tuple var a: (auto,) = 1; return 0; } diff --git a/explorer/testdata/tuple/index.carbon b/explorer/testdata/tuple/index.carbon index 8c4beeb72ed8..ec8b59fb6d05 100644 --- a/explorer/testdata/tuple/index.carbon +++ b/explorer/testdata/tuple/index.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/tuple/match.carbon b/explorer/testdata/tuple/match.carbon index a51e44391a8b..af444e262cb8 100644 --- a/explorer/testdata/tuple/match.carbon +++ b/explorer/testdata/tuple/match.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/tuple/match_nested.carbon b/explorer/testdata/tuple/match_nested.carbon index 2c0a4a1357cb..b71eddb7bbd3 100644 --- a/explorer/testdata/tuple/match_nested.carbon +++ b/explorer/testdata/tuple/match_nested.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/tuple/no_ending_comma.carbon b/explorer/testdata/tuple/no_ending_comma.carbon index 419c224eb57d..de5fe95dc9a9 100644 --- a/explorer/testdata/tuple/no_ending_comma.carbon +++ b/explorer/testdata/tuple/no_ending_comma.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/tuple/to_array.carbon b/explorer/testdata/tuple/to_array.carbon index 828d294a9247..95fe1a28a198 100644 --- a/explorer/testdata/tuple/to_array.carbon +++ b/explorer/testdata/tuple/to_array.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/tuple/to_type.carbon b/explorer/testdata/tuple/to_type.carbon index 6a933ba285ae..75bb4eb067df 100644 --- a/explorer/testdata/tuple/to_type.carbon +++ b/explorer/testdata/tuple/to_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 4 package ExplorerTest api; diff --git a/explorer/testdata/unformed/control_flow_defer_to_dynamic.carbon b/explorer/testdata/unformed/control_flow_defer_to_dynamic.carbon index 316954113d81..03e4ecd9b982 100644 --- a/explorer/testdata/unformed/control_flow_defer_to_dynamic.carbon +++ b/explorer/testdata/unformed/control_flow_defer_to_dynamic.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/unformed/destroy_formed_only.carbon b/explorer/testdata/unformed/destroy_formed_only.carbon index 707a8fe576ba..2e72f9c8c923 100644 --- a/explorer/testdata/unformed/destroy_formed_only.carbon +++ b/explorer/testdata/unformed/destroy_formed_only.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: Destructor A 3 // CHECK:STDOUT: Destructor A 1 // CHECK:STDOUT: result: 0 diff --git a/explorer/testdata/unformed/dynamic/fail_global.carbon b/explorer/testdata/unformed/dynamic/fail_global.carbon index e43e26bad94c..b72b0c8bf82c 100644 --- a/explorer/testdata/unformed/dynamic/fail_global.carbon +++ b/explorer/testdata/unformed/dynamic/fail_global.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; var x: i32; fn Main() -> i32 { - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/unformed/dynamic/fail_global.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/unformed/dynamic/fail_global.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> return x; } diff --git a/explorer/testdata/unformed/dynamic/fail_param.carbon b/explorer/testdata/unformed/dynamic/fail_param.carbon index 958d3fca29b5..c4a7a6f429de 100644 --- a/explorer/testdata/unformed/dynamic/fail_param.carbon +++ b/explorer/testdata/unformed/dynamic/fail_param.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -18,6 +16,6 @@ fn Main() -> i32 { x = 0; } // Static analysis thinks `x` may be formed, defer the check to run-time. - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/unformed/dynamic/fail_param.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/unformed/dynamic/fail_param.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> return AddInt(x, 2); } diff --git a/explorer/testdata/unformed/dynamic/fail_pattern_declare.carbon b/explorer/testdata/unformed/dynamic/fail_pattern_declare.carbon index 00e565f3acab..4ff0fd52afc1 100644 --- a/explorer/testdata/unformed/dynamic/fail_pattern_declare.carbon +++ b/explorer/testdata/unformed/dynamic/fail_pattern_declare.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,6 +13,6 @@ fn Main() -> i32 { y = 0; } // Static analysis thinks `y` may be formed, defer the check to run-time. - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/unformed/dynamic/fail_pattern_declare.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/unformed/dynamic/fail_pattern_declare.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> return y; } diff --git a/explorer/testdata/unformed/dynamic/fail_return.carbon b/explorer/testdata/unformed/dynamic/fail_return.carbon index 5cdc29227f95..5b4c0b8aceb2 100644 --- a/explorer/testdata/unformed/dynamic/fail_return.carbon +++ b/explorer/testdata/unformed/dynamic/fail_return.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,6 +12,6 @@ fn Main() -> i32 { x = 0; } // Static analysis thinks `x` may be formed, defer the check to run-time. - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/unformed/dynamic/fail_return.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/unformed/dynamic/fail_return.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> return x; } diff --git a/explorer/testdata/unformed/dynamic/fail_returned_var.carbon b/explorer/testdata/unformed/dynamic/fail_returned_var.carbon index 39c87e33b397..f5832cd88ae4 100644 --- a/explorer/testdata/unformed/dynamic/fail_returned_var.carbon +++ b/explorer/testdata/unformed/dynamic/fail_returned_var.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,6 +12,6 @@ fn Main() -> i32 { x = 0; } // Static analysis thinks `x` may be formed, defer the check to run-time. - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/unformed/dynamic/fail_returned_var.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/unformed/dynamic/fail_returned_var.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> return var; } diff --git a/explorer/testdata/unformed/dynamic/fail_rhs_assign.carbon b/explorer/testdata/unformed/dynamic/fail_rhs_assign.carbon index 47c048fe8d80..d0e13d6964fc 100644 --- a/explorer/testdata/unformed/dynamic/fail_rhs_assign.carbon +++ b/explorer/testdata/unformed/dynamic/fail_rhs_assign.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,7 +13,7 @@ fn Main() -> i32 { x = 0; } // Static analysis thinks `x` may be formed, defer the check to run-time. - // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/testdata/unformed/dynamic/fail_rhs_assign.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> + // CHECK:STDERR: RUNTIME ERROR: explorer/testdata/unformed/dynamic/fail_rhs_assign.carbon:[[@LINE+1]]: undefined behavior: access to uninitialized value Uninit> y = x; return y; } diff --git a/explorer/testdata/unformed/global_assign_before_use.carbon b/explorer/testdata/unformed/global_assign_before_use.carbon index 845e6b4b26ee..9ce6d82be110 100644 --- a/explorer/testdata/unformed/global_assign_before_use.carbon +++ b/explorer/testdata/unformed/global_assign_before_use.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/unformed/global_escape.carbon b/explorer/testdata/unformed/global_escape.carbon index daf23da23bd0..167ea201b2c7 100644 --- a/explorer/testdata/unformed/global_escape.carbon +++ b/explorer/testdata/unformed/global_escape.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 42 package ExplorerTest api; diff --git a/explorer/testdata/unformed/global_unformed_without_use.carbon b/explorer/testdata/unformed/global_unformed_without_use.carbon index 28e4b20965cb..64482fc25daa 100644 --- a/explorer/testdata/unformed/global_unformed_without_use.carbon +++ b/explorer/testdata/unformed/global_unformed_without_use.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/unformed/local_assign_before_use.carbon b/explorer/testdata/unformed/local_assign_before_use.carbon index 3d063644b54b..702247213d8a 100644 --- a/explorer/testdata/unformed/local_assign_before_use.carbon +++ b/explorer/testdata/unformed/local_assign_before_use.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/unformed/local_escape.carbon b/explorer/testdata/unformed/local_escape.carbon index cf5dd4520e09..cde40a20095d 100644 --- a/explorer/testdata/unformed/local_escape.carbon +++ b/explorer/testdata/unformed/local_escape.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 42 package ExplorerTest api; diff --git a/explorer/testdata/unformed/local_unformed_without_use.carbon b/explorer/testdata/unformed/local_unformed_without_use.carbon index 099b06bc02fb..ce3030e49b34 100644 --- a/explorer/testdata/unformed/local_unformed_without_use.carbon +++ b/explorer/testdata/unformed/local_unformed_without_use.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/unformed/pattern_declare.carbon b/explorer/testdata/unformed/pattern_declare.carbon index 2728b67348f5..3efac610b817 100644 --- a/explorer/testdata/unformed/pattern_declare.carbon +++ b/explorer/testdata/unformed/pattern_declare.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/unformed/returned_var_assign_before_use.carbon b/explorer/testdata/unformed/returned_var_assign_before_use.carbon index c911d743fb3f..483083daf9df 100644 --- a/explorer/testdata/unformed/returned_var_assign_before_use.carbon +++ b/explorer/testdata/unformed/returned_var_assign_before_use.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/unformed/static/fail_compound_assign.carbon b/explorer/testdata/unformed/static/fail_compound_assign.carbon index 9fb25dbc5935..62f115cd6664 100644 --- a/explorer/testdata/unformed/static/fail_compound_assign.carbon +++ b/explorer/testdata/unformed/static/fail_compound_assign.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_compound_assign.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_compound_assign.carbon:[[@LINE+1]]: use of uninitialized variable x x += 1; return x; } diff --git a/explorer/testdata/unformed/static/fail_field_value.carbon b/explorer/testdata/unformed/static/fail_field_value.carbon index c0d906b9234c..b32b9c0a79d2 100644 --- a/explorer/testdata/unformed/static/fail_field_value.carbon +++ b/explorer/testdata/unformed/static/fail_field_value.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_field_value.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_field_value.carbon:[[@LINE+1]]: use of uninitialized variable x var p: auto = {.x = x,}; return 0; } diff --git a/explorer/testdata/unformed/static/fail_if_cond.carbon b/explorer/testdata/unformed/static/fail_if_cond.carbon index a9fb9e723149..e9611b6e252d 100644 --- a/explorer/testdata/unformed/static/fail_if_cond.carbon +++ b/explorer/testdata/unformed/static/fail_if_cond.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_if_cond.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_if_cond.carbon:[[@LINE+1]]: use of uninitialized variable x if (x == 0) { return 0; } diff --git a/explorer/testdata/unformed/static/fail_if_else.carbon b/explorer/testdata/unformed/static/fail_if_else.carbon index 39f96db14aca..9ffb9fa20197 100644 --- a/explorer/testdata/unformed/static/fail_if_else.carbon +++ b/explorer/testdata/unformed/static/fail_if_else.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,7 +13,7 @@ fn Main() -> i32 { if (Foo() == 0) { return 0; } else { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_if_else.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_if_else.carbon:[[@LINE+1]]: use of uninitialized variable x return x; } } diff --git a/explorer/testdata/unformed/static/fail_if_then.carbon b/explorer/testdata/unformed/static/fail_if_then.carbon index aa51987868fd..5a21dc247d19 100644 --- a/explorer/testdata/unformed/static/fail_if_then.carbon +++ b/explorer/testdata/unformed/static/fail_if_then.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ fn Foo() -> i32; fn Main() -> i32 { var x: i32; if (Foo() == 0) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_if_then.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_if_then.carbon:[[@LINE+1]]: use of uninitialized variable x return x; } return 1; diff --git a/explorer/testdata/unformed/static/fail_increment.carbon b/explorer/testdata/unformed/static/fail_increment.carbon index 25860aa5f292..522211cd079d 100644 --- a/explorer/testdata/unformed/static/fail_increment.carbon +++ b/explorer/testdata/unformed/static/fail_increment.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_increment.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_increment.carbon:[[@LINE+1]]: use of uninitialized variable x ++x; return x; } diff --git a/explorer/testdata/unformed/static/fail_local_pattern_declare.carbon b/explorer/testdata/unformed/static/fail_local_pattern_declare.carbon index 6abf714eb2c9..6910a36e2c28 100644 --- a/explorer/testdata/unformed/static/fail_local_pattern_declare.carbon +++ b/explorer/testdata/unformed/static/fail_local_pattern_declare.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var (x: i32, y: i32); x = 1; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_local_pattern_declare.carbon:[[@LINE+1]]: use of uninitialized variable y + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_local_pattern_declare.carbon:[[@LINE+1]]: use of uninitialized variable y return y; } diff --git a/explorer/testdata/unformed/static/fail_local_rhs_assign.carbon b/explorer/testdata/unformed/static/fail_local_rhs_assign.carbon index 86c0b3ad6329..15c0d67e8e9c 100644 --- a/explorer/testdata/unformed/static/fail_local_rhs_assign.carbon +++ b/explorer/testdata/unformed/static/fail_local_rhs_assign.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32; var y: i32; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_local_rhs_assign.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_local_rhs_assign.carbon:[[@LINE+1]]: use of uninitialized variable x y = x; return y; } diff --git a/explorer/testdata/unformed/static/fail_match_clause.carbon b/explorer/testdata/unformed/static/fail_match_clause.carbon index ce8d0fff08f7..497c17f30c0a 100644 --- a/explorer/testdata/unformed/static/fail_match_clause.carbon +++ b/explorer/testdata/unformed/static/fail_match_clause.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -17,7 +15,7 @@ fn Main() -> i32 { return 2; } case 1 => { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_match_clause.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_match_clause.carbon:[[@LINE+1]]: use of uninitialized variable x return x; } default => { diff --git a/explorer/testdata/unformed/static/fail_match_expression.carbon b/explorer/testdata/unformed/static/fail_match_expression.carbon index 667212fa9365..fa3f44943cda 100644 --- a/explorer/testdata/unformed/static/fail_match_expression.carbon +++ b/explorer/testdata/unformed/static/fail_match_expression.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x : i32; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_match_expression.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_match_expression.carbon:[[@LINE+1]]: use of uninitialized variable x match (x) { case 0 => { return 1; diff --git a/explorer/testdata/unformed/static/fail_param.carbon b/explorer/testdata/unformed/static/fail_param.carbon index 7a73b86e9c25..b38caad24517 100644 --- a/explorer/testdata/unformed/static/fail_param.carbon +++ b/explorer/testdata/unformed/static/fail_param.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -14,6 +12,6 @@ fn AddInt(a: i32, b: i32) -> auto { fn Main() -> i32 { var x: i32; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_param.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_param.carbon:[[@LINE+1]]: use of uninitialized variable x return AddInt(x, 2); } diff --git a/explorer/testdata/unformed/static/fail_return.carbon b/explorer/testdata/unformed/static/fail_return.carbon index fa83ed8f2a42..5a7db2c5e8f9 100644 --- a/explorer/testdata/unformed/static/fail_return.carbon +++ b/explorer/testdata/unformed/static/fail_return.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_return.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_return.carbon:[[@LINE+1]]: use of uninitialized variable x return x; } diff --git a/explorer/testdata/unformed/static/fail_returned_var.carbon b/explorer/testdata/unformed/static/fail_returned_var.carbon index 0f79fa50257c..277466641f23 100644 --- a/explorer/testdata/unformed/static/fail_returned_var.carbon +++ b/explorer/testdata/unformed/static/fail_returned_var.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { returned var x: i32; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_returned_var.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_returned_var.carbon:[[@LINE+1]]: use of uninitialized variable x return var; } diff --git a/explorer/testdata/unformed/static/fail_rhs_def.carbon b/explorer/testdata/unformed/static/fail_rhs_def.carbon index 4c83059d2c03..3ff379a52443 100644 --- a/explorer/testdata/unformed/static/fail_rhs_def.carbon +++ b/explorer/testdata/unformed/static/fail_rhs_def.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var x: i32; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_rhs_def.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_rhs_def.carbon:[[@LINE+1]]: use of uninitialized variable x var y: i32 = x; return x; } diff --git a/explorer/testdata/unformed/static/fail_struct_member_access.carbon b/explorer/testdata/unformed/static/fail_struct_member_access.carbon index 49d61e590897..0bfcaea29ca3 100644 --- a/explorer/testdata/unformed/static/fail_struct_member_access.carbon +++ b/explorer/testdata/unformed/static/fail_struct_member_access.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var p: {.x: i32, .y: i32}; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_struct_member_access.carbon:[[@LINE+1]]: use of uninitialized variable p + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_struct_member_access.carbon:[[@LINE+1]]: use of uninitialized variable p p.x = p.y; return 0; } diff --git a/explorer/testdata/unformed/static/fail_while_body.carbon b/explorer/testdata/unformed/static/fail_while_body.carbon index b0ffd8ef786b..b9f3c6a8e12d 100644 --- a/explorer/testdata/unformed/static/fail_while_body.carbon +++ b/explorer/testdata/unformed/static/fail_while_body.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ fn Foo() -> i32; fn Main() -> i32 { var (x: i32, y: i32); while (Foo() == 0) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_while_body.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_while_body.carbon:[[@LINE+1]]: use of uninitialized variable x y = x; } return 1; diff --git a/explorer/testdata/unformed/static/fail_while_cond.carbon b/explorer/testdata/unformed/static/fail_while_cond.carbon index 103e6d3a6b01..a696f175a937 100644 --- a/explorer/testdata/unformed/static/fail_while_cond.carbon +++ b/explorer/testdata/unformed/static/fail_while_cond.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { var (x: i32, y: i32); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/unformed/static/fail_while_cond.carbon:[[@LINE+1]]: use of uninitialized variable x + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/unformed/static/fail_while_cond.carbon:[[@LINE+1]]: use of uninitialized variable x while (x == 0) { y = 1; } diff --git a/explorer/testdata/var/global/fail_init_type_mismatch.carbon b/explorer/testdata/var/global/fail_init_type_mismatch.carbon index 216d52dd4938..7b7fd5ab2ce0 100644 --- a/explorer/testdata/var/global/fail_init_type_mismatch.carbon +++ b/explorer/testdata/var/global/fail_init_type_mismatch.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; // Test type checking of global variable. Error expected. -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/global/fail_init_type_mismatch.carbon:[[@LINE+1]]: type error in initializer of variable: 'bool' is not implicitly convertible to 'i32' +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/global/fail_init_type_mismatch.carbon:[[@LINE+1]]: type error in initializer of variable: 'bool' is not implicitly convertible to 'i32' var flag: i32 = true; fn Main() -> i32 { diff --git a/explorer/testdata/var/global/fail_instantiate_global_abstract.carbon b/explorer/testdata/var/global/fail_instantiate_global_abstract.carbon index 682cf9eb00ef..d7b4ab0c93bf 100644 --- a/explorer/testdata/var/global/fail_instantiate_global_abstract.carbon +++ b/explorer/testdata/var/global/fail_instantiate_global_abstract.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; abstract class B { } -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/global/fail_instantiate_global_abstract.carbon:[[@LINE+1]]: Cannot instantiate abstract class B +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/global/fail_instantiate_global_abstract.carbon:[[@LINE+1]]: Cannot instantiate abstract class B var b: B = {}; fn Main() -> i32 { diff --git a/explorer/testdata/var/global/fail_invalid_var_expression.carbon b/explorer/testdata/var/global/fail_invalid_var_expression.carbon index af74ff4fb282..07737bd28721 100644 --- a/explorer/testdata/var/global/fail_invalid_var_expression.carbon +++ b/explorer/testdata/var/global/fail_invalid_var_expression.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/global/fail_invalid_var_expression.carbon:[[@LINE+1]]: Expected expression for variable type +// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/global/fail_invalid_var_expression.carbon:[[@LINE+1]]: Expected expression for variable type var a: auto; fn Main() -> i32 { return 0; } diff --git a/explorer/testdata/var/global/fail_modify_in_constant_expr.carbon b/explorer/testdata/var/global/fail_modify_in_constant_expr.carbon index 158b6dd51720..58d3407c94c7 100644 --- a/explorer/testdata/var/global/fail_modify_in_constant_expr.carbon +++ b/explorer/testdata/var/global/fail_modify_in_constant_expr.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -13,7 +11,7 @@ var n: i32 = 0; fn F() -> type { // TODO: This isn't a very good description of the problem, which is that // compile-time evaluation doesn't have a mutable `n` value available. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/global/fail_modify_in_constant_expr.carbon:[[@LINE+1]]: could not find `n: i32` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/global/fail_modify_in_constant_expr.carbon:[[@LINE+1]]: could not find `n: i32` n = 1; return i32; } diff --git a/explorer/testdata/var/global/fail_named_self.carbon b/explorer/testdata/var/global/fail_named_self.carbon index 611273ecec2e..487492d4e38f 100644 --- a/explorer/testdata/var/global/fail_named_self.carbon +++ b/explorer/testdata/var/global/fail_named_self.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; // Error: global variable may not be named with keyword `Self`. -// CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/var/global/fail_named_self.carbon:[[@LINE+1]]: syntax error, unexpected SELF, expecting identifier +// CHECK:STDERR: SYNTAX ERROR: explorer/testdata/var/global/fail_named_self.carbon:[[@LINE+1]]: syntax error, unexpected SELF, expecting identifier var Self: i32 = 0; fn Main() -> i32 { diff --git a/explorer/testdata/var/global/fail_nested_binding.carbon b/explorer/testdata/var/global/fail_nested_binding.carbon index 345bf69d4fb8..dc9cb2ac3ce0 100644 --- a/explorer/testdata/var/global/fail_nested_binding.carbon +++ b/explorer/testdata/var/global/fail_nested_binding.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; // If support for this is added, it'll be necessary to verify that either the // implementation is shared with locals or that tests are copied over for edge // cases. -// CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/var/global/fail_nested_binding.carbon:[[@LINE+1]]: syntax error, unexpected LEFT_PARENTHESIS, expecting identifier +// CHECK:STDERR: SYNTAX ERROR: explorer/testdata/var/global/fail_nested_binding.carbon:[[@LINE+1]]: syntax error, unexpected LEFT_PARENTHESIS, expecting identifier var (x: i32,); fn Main() -> i32 { diff --git a/explorer/testdata/var/global/fail_type_only.carbon b/explorer/testdata/var/global/fail_type_only.carbon index c66377ae1efb..52161375ca17 100644 --- a/explorer/testdata/var/global/fail_type_only.carbon +++ b/explorer/testdata/var/global/fail_type_only.carbon @@ -3,12 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; -// CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/var/global/fail_type_only.carbon:[[@LINE+1]]: syntax error, unexpected sized_type_literal, expecting identifier +// CHECK:STDERR: SYNTAX ERROR: explorer/testdata/var/global/fail_type_only.carbon:[[@LINE+1]]: syntax error, unexpected sized_type_literal, expecting identifier var i32; fn Main() -> i32 { diff --git a/explorer/testdata/var/global/implicit_conversion.carbon b/explorer/testdata/var/global/implicit_conversion.carbon index 9d8c5abca0e4..eb308ae13e49 100644 --- a/explorer/testdata/var/global/implicit_conversion.carbon +++ b/explorer/testdata/var/global/implicit_conversion.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 5 package ExplorerTest api; diff --git a/explorer/testdata/var/global/init_and_read.carbon b/explorer/testdata/var/global/init_and_read.carbon index 9ca9586f8c6a..3ad59790823a 100644 --- a/explorer/testdata/var/global/init_and_read.carbon +++ b/explorer/testdata/var/global/init_and_read.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/var/global/init_from_function.carbon b/explorer/testdata/var/global/init_from_function.carbon index 2abeb05ebdea..ad84a34fd039 100644 --- a/explorer/testdata/var/global/init_from_function.carbon +++ b/explorer/testdata/var/global/init_from_function.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/var/global/init_order.carbon b/explorer/testdata/var/global/init_order.carbon index fa071548c2d4..4ae60885e677 100644 --- a/explorer/testdata/var/global/init_order.carbon +++ b/explorer/testdata/var/global/init_order.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/var/global/shadowing.carbon b/explorer/testdata/var/global/shadowing.carbon index 8ae040b03a5f..c6bdcfe07b7a 100644 --- a/explorer/testdata/var/global/shadowing.carbon +++ b/explorer/testdata/var/global/shadowing.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/var/global/write.carbon b/explorer/testdata/var/global/write.carbon index 4866950d7037..6a52c1ffc27a 100644 --- a/explorer/testdata/var/global/write.carbon +++ b/explorer/testdata/var/global/write.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/var/global/write_from_function.carbon b/explorer/testdata/var/global/write_from_function.carbon index d1cec5bb5220..1e159333d08a 100644 --- a/explorer/testdata/var/global/write_from_function.carbon +++ b/explorer/testdata/var/global/write_from_function.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/var/local/fail_generic_binding_in_type.carbon b/explorer/testdata/var/local/fail_generic_binding_in_type.carbon index 3b9f0da4caff..7299b276fce2 100644 --- a/explorer/testdata/var/local/fail_generic_binding_in_type.carbon +++ b/explorer/testdata/var/local/fail_generic_binding_in_type.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/local/fail_generic_binding_in_type.carbon:[[@LINE+1]]: Binding types cannot contain bindings, but `T:! type` is a binding. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/local/fail_generic_binding_in_type.carbon:[[@LINE+1]]: Binding types cannot contain bindings, but `T:! type` is a binding. var x: (T:! type) = 1; return 1; } diff --git a/explorer/testdata/var/local/fail_missing_intro.carbon b/explorer/testdata/var/local/fail_missing_intro.carbon index 9cf433c65b0f..74680a534b6f 100644 --- a/explorer/testdata/var/local/fail_missing_intro.carbon +++ b/explorer/testdata/var/local/fail_missing_intro.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/var/local/fail_missing_intro.carbon:[[@LINE+1]]: syntax error, unexpected COLON + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/var/local/fail_missing_intro.carbon:[[@LINE+1]]: syntax error, unexpected COLON x: i32; return 1; } diff --git a/explorer/testdata/var/local/fail_named_self_type.carbon b/explorer/testdata/var/local/fail_named_self_type.carbon index 8134c9abfa46..03272150da2a 100644 --- a/explorer/testdata/var/local/fail_named_self_type.carbon +++ b/explorer/testdata/var/local/fail_named_self_type.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -12,7 +10,7 @@ fn Main() -> i32 { // Error: can't use keyword `Self` as the name of a variable. // TODO: Current error message is unclear, better would be to say // something like: unexpected `Self`, expecting identifier - // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/var/local/fail_named_self_type.carbon:[[@LINE+1]]: syntax error, unexpected COLON, expecting EQUAL or SEMICOLON + // CHECK:STDERR: SYNTAX ERROR: explorer/testdata/var/local/fail_named_self_type.carbon:[[@LINE+1]]: syntax error, unexpected COLON, expecting EQUAL or SEMICOLON var Self: i32 = 0; return 0; } diff --git a/explorer/testdata/var/local/fail_nested_binding_in_type.carbon b/explorer/testdata/var/local/fail_nested_binding_in_type.carbon index 6b2ce3930663..d7a8142cf33f 100644 --- a/explorer/testdata/var/local/fail_nested_binding_in_type.carbon +++ b/explorer/testdata/var/local/fail_nested_binding_in_type.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/local/fail_nested_binding_in_type.carbon:[[@LINE+1]]: Binding types cannot contain bindings, but `T: type` is a binding. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/local/fail_nested_binding_in_type.carbon:[[@LINE+1]]: Binding types cannot contain bindings, but `T: type` is a binding. var x: (T: type) = 1; return 1; } diff --git a/explorer/testdata/var/local/fail_nested_type_only.carbon b/explorer/testdata/var/local/fail_nested_type_only.carbon index 048b7a0ac91b..a20aa3faf277 100644 --- a/explorer/testdata/var/local/fail_nested_type_only.carbon +++ b/explorer/testdata/var/local/fail_nested_type_only.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/local/fail_nested_type_only.carbon:[[@LINE+1]]: An irrefutable pattern is required, but `i32` is refutable. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/local/fail_nested_type_only.carbon:[[@LINE+1]]: An irrefutable pattern is required, but `i32` is refutable. var (x: i32, i32); return 0; } diff --git a/explorer/testdata/var/local/fail_type_only.carbon b/explorer/testdata/var/local/fail_type_only.carbon index f084437bc94a..2c1b2958df1d 100644 --- a/explorer/testdata/var/local/fail_type_only.carbon +++ b/explorer/testdata/var/local/fail_type_only.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/local/fail_type_only.carbon:[[@LINE+1]]: An irrefutable pattern is required, but `i32` is refutable. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/local/fail_type_only.carbon:[[@LINE+1]]: An irrefutable pattern is required, but `i32` is refutable. var i32; return 0; } diff --git a/explorer/testdata/var/local/fail_value_as_type.carbon b/explorer/testdata/var/local/fail_value_as_type.carbon index 7104afae82ab..dbee3daeef4f 100644 --- a/explorer/testdata/var/local/fail_value_as_type.carbon +++ b/explorer/testdata/var/local/fail_value_as_type.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Main() -> i32 { // 42 cannot be used as the type of a variable. - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/local/fail_value_as_type.carbon:[[@LINE+1]]: type error in type of name binding: 'i32' is not implicitly convertible to 'type' + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/local/fail_value_as_type.carbon:[[@LINE+1]]: type error in type of name binding: 'i32' is not implicitly convertible to 'type' var x: 42 = 0; return x; } diff --git a/explorer/testdata/var/local/nested_binding.carbon b/explorer/testdata/var/local/nested_binding.carbon index adf7aacb6041..6cb15e5f3d14 100644 --- a/explorer/testdata/var/local/nested_binding.carbon +++ b/explorer/testdata/var/local/nested_binding.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/var/local/placeholder.carbon b/explorer/testdata/var/local/placeholder.carbon index c6094c570b97..2140961472ae 100644 --- a/explorer/testdata/var/local/placeholder.carbon +++ b/explorer/testdata/var/local/placeholder.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/var/local/use_value.carbon b/explorer/testdata/var/local/use_value.carbon index 922bd724e9f8..30f39b6dc59d 100644 --- a/explorer/testdata/var/local/use_value.carbon +++ b/explorer/testdata/var/local/use_value.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/var/returned/fail_duplicate_return_var.carbon b/explorer/testdata/var/returned/fail_duplicate_return_var.carbon index bb0d7f7cd762..520a7789afbf 100644 --- a/explorer/testdata/var/returned/fail_duplicate_return_var.carbon +++ b/explorer/testdata/var/returned/fail_duplicate_return_var.carbon @@ -3,15 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn AddInt(a: i32, b: i32) -> i32 { returned var ret: i32 = a + b; if (a == b) { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/returned/fail_duplicate_return_var.carbon:[[@LINE+1]]: Duplicate definition of returned var also found at {{.*}}/explorer/testdata/var/returned/fail_duplicate_return_var.carbon:[[@LINE-2]] + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/returned/fail_duplicate_return_var.carbon:[[@LINE+1]]: Duplicate definition of returned var also found at explorer/testdata/var/returned/fail_duplicate_return_var.carbon:[[@LINE-2]] returned var ret2: i32 = a + b; } return var; diff --git a/explorer/testdata/var/returned/fail_missing_declaration.carbon b/explorer/testdata/var/returned/fail_missing_declaration.carbon index 451f4a43fdae..475d9dbb8ffe 100644 --- a/explorer/testdata/var/returned/fail_missing_declaration.carbon +++ b/explorer/testdata/var/returned/fail_missing_declaration.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn AddInt(a: i32, b: i32) -> i32 { var ret: i32 = a + b; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/returned/fail_missing_declaration.carbon:[[@LINE+1]]: `return var` is not allowed without a returned var defined in scope. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/returned/fail_missing_declaration.carbon:[[@LINE+1]]: `return var` is not allowed without a returned var defined in scope. return var; } diff --git a/explorer/testdata/var/returned/fail_missing_return.carbon b/explorer/testdata/var/returned/fail_missing_return.carbon index dd557bb9dbf0..dda3aa5d2d63 100644 --- a/explorer/testdata/var/returned/fail_missing_return.carbon +++ b/explorer/testdata/var/returned/fail_missing_return.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn AddInt(a: i32, b: i32) -> i32 { returned var ret: i32 = a + b; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/returned/fail_missing_return.carbon:[[@LINE+1]]: `return ` is not allowed with a returned var defined in scope: {{.*}}/explorer/testdata/var/returned/fail_missing_return.carbon:[[@LINE-1]] + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/returned/fail_missing_return.carbon:[[@LINE+1]]: `return ` is not allowed with a returned var defined in scope: explorer/testdata/var/returned/fail_missing_return.carbon:[[@LINE-1]] return ret; } diff --git a/explorer/testdata/var/returned/fail_returned_var_mismatch_signature.carbon b/explorer/testdata/var/returned/fail_returned_var_mismatch_signature.carbon index 8edc9a70534d..c73221abc6f8 100644 --- a/explorer/testdata/var/returned/fail_returned_var_mismatch_signature.carbon +++ b/explorer/testdata/var/returned/fail_returned_var_mismatch_signature.carbon @@ -3,14 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn Foo() { returned var x: () = (); - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/returned/fail_returned_var_mismatch_signature.carbon:[[@LINE+1]]: return var; should not provide a return value, to match the function's signature. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/returned/fail_returned_var_mismatch_signature.carbon:[[@LINE+1]]: return var; should not provide a return value, to match the function's signature. return var; } diff --git a/explorer/testdata/var/returned/fail_returned_var_multi_auto.carbon b/explorer/testdata/var/returned/fail_returned_var_multi_auto.carbon index 6d560bb3ec37..493789b77346 100644 --- a/explorer/testdata/var/returned/fail_returned_var_multi_auto.carbon +++ b/explorer/testdata/var/returned/fail_returned_var_multi_auto.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; @@ -15,7 +13,7 @@ fn Foo(a: i32, b: i32) -> auto { return var; } ret = a - b; - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/returned/fail_returned_var_multi_auto.carbon:[[@LINE+1]]: Only one return is allowed in a function with an `auto` return type. + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/returned/fail_returned_var_multi_auto.carbon:[[@LINE+1]]: Only one return is allowed in a function with an `auto` return type. return var; } diff --git a/explorer/testdata/var/returned/fail_returned_var_type_mismatch.carbon b/explorer/testdata/var/returned/fail_returned_var_type_mismatch.carbon index b31fc2cc7816..ebf1b9bf7d46 100644 --- a/explorer/testdata/var/returned/fail_returned_var_type_mismatch.carbon +++ b/explorer/testdata/var/returned/fail_returned_var_type_mismatch.carbon @@ -3,13 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{not} %{explorer-run} -// RUN: %{not} %{explorer-run-trace} package ExplorerTest api; fn AddInt(a: i32, b: i32) -> i32 { - // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/var/returned/fail_returned_var_type_mismatch.carbon:[[@LINE+1]]: type of returned var `bool` does not match return type `i32` + // CHECK:STDERR: COMPILATION ERROR: explorer/testdata/var/returned/fail_returned_var_type_mismatch.carbon:[[@LINE+1]]: type of returned var `bool` does not match return type `i32` returned var ret: bool = true; return var; } diff --git a/explorer/testdata/var/returned/multiple_returned_var_control_flow.carbon b/explorer/testdata/var/returned/multiple_returned_var_control_flow.carbon index 0242aff067db..3600b36cc6a3 100644 --- a/explorer/testdata/var/returned/multiple_returned_var_control_flow.carbon +++ b/explorer/testdata/var/returned/multiple_returned_var_control_flow.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/var/returned/normal_return_control_flow.carbon b/explorer/testdata/var/returned/normal_return_control_flow.carbon index fac047cf4d9c..d95c1ecc7337 100644 --- a/explorer/testdata/var/returned/normal_return_control_flow.carbon +++ b/explorer/testdata/var/returned/normal_return_control_flow.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/var/returned/returned_var_auto.carbon b/explorer/testdata/var/returned/returned_var_auto.carbon index cbae7c6d0a4a..da1a26bd224a 100644 --- a/explorer/testdata/var/returned/returned_var_auto.carbon +++ b/explorer/testdata/var/returned/returned_var_auto.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/var/returned/returned_var_basic.carbon b/explorer/testdata/var/returned/returned_var_basic.carbon index fbd717498dbb..286f573d5c66 100644 --- a/explorer/testdata/var/returned/returned_var_basic.carbon +++ b/explorer/testdata/var/returned/returned_var_basic.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 3 package ExplorerTest api; diff --git a/explorer/testdata/var/returned/returned_var_name_lookup.carbon b/explorer/testdata/var/returned/returned_var_name_lookup.carbon index 652b36cb78c8..6cb9027dc7cd 100644 --- a/explorer/testdata/var/returned/returned_var_name_lookup.carbon +++ b/explorer/testdata/var/returned/returned_var_name_lookup.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 1 package ExplorerTest api; diff --git a/explorer/testdata/var/returned/returned_var_omitted_expression.carbon b/explorer/testdata/var/returned/returned_var_omitted_expression.carbon index 68f71df93a17..21963c4d3c94 100644 --- a/explorer/testdata/var/returned/returned_var_omitted_expression.carbon +++ b/explorer/testdata/var/returned/returned_var_omitted_expression.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/while/basic.carbon b/explorer/testdata/while/basic.carbon index 56f267e2967b..9dff242265c5 100644 --- a/explorer/testdata/while/basic.carbon +++ b/explorer/testdata/while/basic.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/while/break.carbon b/explorer/testdata/while/break.carbon index 655d59d33b82..72eb2ca628ce 100644 --- a/explorer/testdata/while/break.carbon +++ b/explorer/testdata/while/break.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/while/continue.carbon b/explorer/testdata/while/continue.carbon index 536459acc8cd..72884b53916f 100644 --- a/explorer/testdata/while/continue.carbon +++ b/explorer/testdata/while/continue.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api; diff --git a/explorer/testdata/while/convert_condition.carbon b/explorer/testdata/while/convert_condition.carbon index 83ce3d38f0bf..5f549868bc45 100644 --- a/explorer/testdata/while/convert_condition.carbon +++ b/explorer/testdata/while/convert_condition.carbon @@ -3,8 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// RUN: %{explorer-run} -// RUN: %{explorer-run-trace} // CHECK:STDOUT: result: 0 package ExplorerTest api;