From d0a48504d8267225b75c9c56cdccdfd90bdd09d4 Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Tue, 3 Jun 2025 10:37:51 -0700 Subject: [PATCH] Flip the dump-sem-ir-ranges default in file_test (#5587) This doesn't remove no-longer-needed flags; I'll do that in a separate PR after this is merged. --------- Co-authored-by: Dana Jansens --- .../testdata/basics/no_prelude/dump_sem_ir_ranges.carbon | 5 ++++- .../basics/no_prelude/dump_sem_ir_ranges_only.carbon | 3 ++- .../check/testdata/packages/implicit_imports_prelude.carbon | 3 +++ toolchain/testing/file_test.cpp | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/toolchain/check/testdata/basics/no_prelude/dump_sem_ir_ranges.carbon b/toolchain/check/testdata/basics/no_prelude/dump_sem_ir_ranges.carbon index fe0571cb742f..7c546e08e8f3 100644 --- a/toolchain/check/testdata/basics/no_prelude/dump_sem_ir_ranges.carbon +++ b/toolchain/check/testdata/basics/no_prelude/dump_sem_ir_ranges.carbon @@ -2,7 +2,10 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // -// The default behavior should be `--dump-sem-ir-ranges=if-present`. +// The default behavior should be `--dump-sem-ir-ranges=if-present`, although +// tests set it to `only`. This explicitly tests the default of the toolchain, +// not of file_test. +// ARGS: compile --phase=check --no-prelude-import --dump-sem-ir %s // // AUTOUPDATE // TIP: To test this file alone, run: diff --git a/toolchain/check/testdata/basics/no_prelude/dump_sem_ir_ranges_only.carbon b/toolchain/check/testdata/basics/no_prelude/dump_sem_ir_ranges_only.carbon index 6f789da16b8f..42502f80919a 100644 --- a/toolchain/check/testdata/basics/no_prelude/dump_sem_ir_ranges_only.carbon +++ b/toolchain/check/testdata/basics/no_prelude/dump_sem_ir_ranges_only.carbon @@ -2,7 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // -// EXTRA-ARGS: --dump-sem-ir-ranges=only +// This tests `--dump-sem-ir-range=only` behavior, which is set implicitly by +// file_test. // // AUTOUPDATE // TIP: To test this file alone, run: diff --git a/toolchain/check/testdata/packages/implicit_imports_prelude.carbon b/toolchain/check/testdata/packages/implicit_imports_prelude.carbon index 63bfa4269c78..1d9275899efd 100644 --- a/toolchain/check/testdata/packages/implicit_imports_prelude.carbon +++ b/toolchain/check/testdata/packages/implicit_imports_prelude.carbon @@ -4,6 +4,9 @@ // // This is just checking an implicit import behavior with the prelude present. // +// TODO: Add ranges and switch to "--dump-sem-ir-ranges=only". +// EXTRA-ARGS: --dump-sem-ir-ranges=if-present +// // AUTOUPDATE // TIP: To test this file alone, run: // TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/packages/implicit_imports_prelude.carbon diff --git a/toolchain/testing/file_test.cpp b/toolchain/testing/file_test.cpp index dae2f68c02f4..7a5fbed1e8a4 100644 --- a/toolchain/testing/file_test.cpp +++ b/toolchain/testing/file_test.cpp @@ -192,7 +192,7 @@ auto ToolchainFileTest::GetDefaultArgs() const } else if (component_ == "parse") { args.push_back("--dump-parse-tree"); } else if (component_ == "check") { - args.push_back("--dump-sem-ir"); + args.insert(args.end(), {"--dump-sem-ir", "--dump-sem-ir-ranges=only"}); } else if (component_ == "lower") { args.insert(args.end(), {"--dump-llvm-ir", "--target=x86_64-linux-gnu"}); } else {