Skip to content

Commit 660bc30

Browse files
committed
Changed the --enable-tsan-runtime option to use the enable action like the surrounding tsan options.
1 parent ac6fd72 commit 660bc30

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

utils/build_swift/driver_arguments.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from swift_build_support.swift_build_support import arguments
1515
from swift_build_support.swift_build_support import host
1616
from swift_build_support.swift_build_support import targets
17-
1817
from swift_build_support.swift_build_support.targets import \
1918
StdlibDeploymentTarget
2019

@@ -990,7 +989,8 @@ def create_argument_parser():
990989
action=arguments.action.enable)
991990
parser.add_argument(
992991
"--enable-tsan-runtime",
993-
help="enable Thread Sanitizer on the swift runtime")
992+
help="enable Thread Sanitizer on the swift runtime",
993+
action=arguments.action.enable)
994994
parser.add_argument(
995995
"--enable-lsan",
996996
help="enable Leak Sanitizer for swift tools",

utils/build_swift/tests/expected_options.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
'enable_lsan': False,
112112
'enable_sil_ownership': False,
113113
'enable_tsan': False,
114-
'enable_tsan_runtime': None,
114+
'enable_tsan_runtime': False,
115115
'enable_ubsan': False,
116116
'export_compile_commands': False,
117117
'extra_cmake_options': [],
@@ -403,6 +403,7 @@ class IgnoreOption(_BaseOption):
403403
EnableOption('--enable-asan'),
404404
EnableOption('--enable-lsan'),
405405
EnableOption('--enable-tsan'),
406+
EnableOption('--enable-tsan-runtime'),
406407
EnableOption('--enable-ubsan'),
407408
EnableOption('--export-compile-commands'),
408409
EnableOption('--foundation', dest='build_foundation'),
@@ -473,7 +474,6 @@ class IgnoreOption(_BaseOption):
473474
StrOption('--darwin-deployment-version-tvos'),
474475
StrOption('--darwin-deployment-version-watchos'),
475476
StrOption('--darwin-xcrun-toolchain'),
476-
StrOption('--enable-tsan-runtime'),
477477
StrOption('--host-target'),
478478
StrOption('--lit-args'),
479479
StrOption('--llvm-targets-to-build'),

0 commit comments

Comments
 (0)