Skip to content

[cxx-interop][test] add %check-interop-cxx-header-in-clang test command substitution to parse and validate generated C++ header in multiple C++ language modes #41794

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 2 commits into from
Mar 12, 2022
Merged

[cxx-interop][test] add %check-interop-cxx-header-in-clang test command substitution to parse and validate generated C++ header in multiple C++ language modes #41794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bf7a6e
[cxx-interop][test] cleanup the lit.local.cfg for reverse Interop tests
hyp Mar 12, 2022
2c2fa56
[cxx-interop][test] add %check-interop-cxx-header-in-clang test comma…
hyp Mar 12, 2022
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
7 changes: 3 additions & 4 deletions test/Interop/SwiftToCxx/functions/cdecl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// RUN: %empty-directory(%t)
// RUN: %target-swift-frontend %s -typecheck -module-name CdeclFunctions -emit-cxx-header-path %t/empty.h
// RUN: %FileCheck %s < %t/empty.h
// RUN: %target-swift-frontend %s -typecheck -module-name CdeclFunctions -emit-cxx-header-path %t/cdecl.h
// RUN: %FileCheck %s < %t/cdecl.h

// RUN: %check-cxx-header-in-clang -std=c++14 %t/empty.h
// RUN: %check-cxx-header-in-clang -std=c++17 %t/empty.h
// RUN: %check-interop-cxx-header-in-clang(%t/cdecl.h)

// CHECK-LABEL: namespace CdeclFunctions {

Expand Down
3 changes: 1 addition & 2 deletions test/Interop/SwiftToCxx/functions/function-availability.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// RUN: %target-swift-frontend %s -typecheck -module-name Functions -emit-cxx-header-path %t/functions.h
// RUN: %FileCheck %s < %t/functions.h

// RUN: %check-cxx-header-in-clang -std=c++14 %t/functions.h
// RUN: %check-cxx-header-in-clang -std=c++17 %t/functions.h
// RUN: %check-interop-cxx-header-in-clang(%t/functions.h)

// CHECK-LABEL: namespace Functions {

Expand Down
3 changes: 1 addition & 2 deletions test/Interop/SwiftToCxx/functions/swift-functions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// RUN: %target-swift-frontend %s -typecheck -module-name Functions -emit-cxx-header-path %t/functions.h
// RUN: %FileCheck %s < %t/functions.h

// RUN: %check-cxx-header-in-clang -std=c++14 %t/functions.h
// RUN: %check-cxx-header-in-clang -std=c++17 %t/functions.h
// RUN: %check-interop-cxx-header-in-clang(%t/functions.h)

// CHECK-LABEL: namespace Functions {

Expand Down
3 changes: 1 addition & 2 deletions test/Interop/SwiftToCxx/module/module-to-namespace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -typecheck -module-name Test -emit-cxx-header-path %t/empty.h
// RUN: %FileCheck %s < %t/empty.h

// RUN: %check-cxx-header-in-clang -std=c++14 %t/empty.h
// RUN: %check-cxx-header-in-clang -std=c++17 %t/empty.h
// RUN: %check-interop-cxx-header-in-clang(%t/empty.h)

// CHECK-LABEL: namespace Test {
// CHECK: } // namespace Test
15 changes: 12 additions & 3 deletions test/Interop/lit.local.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,25 @@ def get_target_os():
(run_cpu, run_vendor, run_os, run_version) = re.match('([^-]+)-([^-]+)-([^0-9]+)(.*)', config.variant_triple).groups()
return run_os

libc_opt = ''
clang_opt = ''

if get_target_os() in ['windows-msvc']:
config.substitutions.insert(0, ('%target-abi', 'WIN'))
#libc_opt = '-libc MT '
# Clang should build object files with link settings equivalent to -libc MD
# when building for the MSVC target.
clang_opt = '-D_MT -D_DLL -Xclang --dependent-lib=msvcrt -Xclang --dependent-lib=oldnames '
else:
# FIXME(compnerd) do all the targets we currently support use SysV ABI?
config.substitutions.insert(0, ('%target-abi', 'SYSV'))

config.substitutions.insert(0, ('%target-interop-build-swift', '%target-build-swift -Xfrontend -enable-cxx-interop ' + libc_opt))
# Enable C++ interop when compiling Swift sources.
config.substitutions.insert(0, ('%target-interop-build-swift',
'%target-build-swift -Xfrontend -enable-cxx-interop '))
# Build C++ files with matching link settings, if required by the target.
config.substitutions.insert(0, ('%target-interop-build-clangxx', '%target-clangxx ' + clang_opt))

# Test parsing of the generated C++ header in different C++ language modes.
config.substitutions.insert(0, ('%check-interop-cxx-header-in-clang\(([^)]+)\)',
SubstituteCaptures(r'%check-cxx-header-in-clang -std=c++14 \1 && '
r'%check-cxx-header-in-clang -std=c++17 \1 && '
r'%check-cxx-header-in-clang -std=c++20 \1')))