Skip to content

Update most toolchain/check/testdata/interop/cpp tests to use sem ir ranges #5594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 11, 2025
Merged

Update most toolchain/check/testdata/interop/cpp tests to use sem ir ranges #5594

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a0eeb57
Update all `toolchain/check/testdata/interop/cpp` tests to use sem ir…
bricknerb Jun 3, 2025
bab609c
commit
bricknerb Jun 4, 2025
78bc0b8
Merge branch 'main' into ranges
bricknerb Jun 10, 2025
3dca8e5
Update tests following merge and add back missing `//@dump-sem-ir-begin`
bricknerb Jun 10, 2025
dc26ca5
Make sure all tests in `toolchain/check/testdata/interop/cpp` have `-…
bricknerb Jun 10, 2025
4bf82a6
Remove SemIR ranges from cases that are intended to fail
bricknerb Jun 10, 2025
367d94c
Change ranges for import_short.carbon to focus on the relevant parts.
bricknerb Jun 11, 2025
dc86e78
Revert `toolchain/check/testdata/interop/cpp/function_param_*.carbon`
bricknerb Jun 11, 2025
66c8249
Revert `toolchain/check/testdata/interop/cpp/function_return.carbon` …
bricknerb Jun 11, 2025
d9d06be
Merge branch 'main' into ranges
bricknerb Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 1 addition & 33 deletions toolchain/check/testdata/interop/cpp/bad_import.carbon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
// TODO: Add ranges and switch to "--dump-sem-ir-ranges=only".
// EXTRA-ARGS: --no-prelude-import --dump-sem-ir-ranges=if-present
// EXTRA-ARGS: --no-prelude-import --dump-sem-ir-ranges=only
//
// AUTOUPDATE
// TIP: To test this file alone, run:
Expand Down Expand Up @@ -42,34 +41,3 @@ library "[[@TEST_NAME]]";
// CHECK:STDERR: [CppInteropParseError]
// CHECK:STDERR:
import Cpp library "\"foo.h\"";

// CHECK:STDOUT: --- fail_import_cpp.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace [concrete] {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: --- fail_import_cpp_library_empty.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace [concrete] {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: --- fail_import_cpp_library_file_with_quotes.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: imports {
// CHECK:STDOUT: %Cpp: <namespace> = namespace file.%Cpp.import_cpp, [concrete] {
// CHECK:STDOUT: import Cpp//...
// CHECK:STDOUT: has_error
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace [concrete] {
// CHECK:STDOUT: .Cpp = imports.%Cpp
// CHECK:STDOUT: }
// CHECK:STDOUT: %Cpp.import_cpp = import_cpp {
// CHECK:STDOUT: import Cpp "\"foo.h\""
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
Loading
Loading