Skip to content

[Tests] Fix RemoteMirror/interop.swift to work with ASAN enabled. #38694

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 1 commit into from
Jul 29, 2021
Merged

[Tests] Fix RemoteMirror/interop.swift to work with ASAN enabled. #38694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions docs/Testing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,9 @@ code for the target that is not the build machine:
* ``%target-cc-options``: the clang flags to setup the target with the right
architecture and platform version.

* ``%target-sanitizer-opt``: if sanitizers are enabled for the build, the
corresponding ``-fsanitize=`` option.

* ``%target-triple``: a triple composed of the ``%target-cpu``, the vendor,
the ``%target-os``, and the operating system version number. Possible values
include ``i386-apple-ios7.0`` or ``armv7k-apple-watchos2.0``.
Expand Down
2 changes: 1 addition & 1 deletion test/RemoteMirror/interop.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// RUN: %empty-directory(%t)
// RUN: %target-build-swift %S/Inputs/interop.swift -emit-library -module-name InteropTest -o %t/%target-library-name(InteropTest)
// RUN: %target-clang %S/Inputs/interop.m -framework Foundation -I %S/../../include/swift/SwiftRemoteMirror -I %S/../../include/ -o %t/InteropTest
// RUN: %target-clang %target-sanitizer-opt %S/Inputs/interop.m -framework Foundation -I %S/../../include/swift/SwiftRemoteMirror -I %S/../../include/ -o %t/InteropTest
// RUN: %target-codesign %t/%target-library-name(InteropTest)
// RUN: %target-codesign %t/InteropTest
// RUN: %target-run %t/InteropTest %t/%target-library-name(InteropTest) %platform-module-dir/%target-library-name(swiftRemoteMirror) | %FileCheck %s
Expand Down
12 changes: 12 additions & 0 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,11 @@ if config.benchmark_o != 'Benchmark_O':
# Add substitutions for the run target triple, CPU, OS, and pointer size.
config.substitutions.append(('%target-triple', config.variant_triple))

# Keep track of which sanitizers need to be enabled (matters for some tests)
config.sanitizers = []
if 'asan' in config.available_features:
config.sanitizers.append('address')

if run_vendor == 'apple':
if run_os == 'maccatalyst':
config.stable_abi_triple = '%s-%s-ios13.0-macabi' % (run_cpu, run_vendor)
Expand Down Expand Up @@ -2052,6 +2057,13 @@ if hasattr(config, 'target_cc_options'):
else:
config.substitutions.append(('%target-cc-options', ''))

# Build an -fsanitize= argument (used by some tests)
if config.sanitizers:
config.substitutions.append(('%target-sanitizer-opt',
'-fsanitize=' + ','.join(config.sanitizers)))
else:
config.substitutions.append(('%target-sanitizer-opt', ''))

# WORKAROUND(rdar://53507844): On some macOS versions, we see flaky failures in
# tests which create a hard link to an executable and immediately invoke it.
# Work around this by always copying on Darwin.
Expand Down