Skip to content

Commit 78234e2

Browse files
authored
Merge pull request swiftlang#81340 from edymtt/edymtt/build-llvm-testing-support-by-default-to-support-run-test
LLVM build product: build LLVMTestingSupport by default
2 parents 7c5a59f + ad3616f commit 78234e2

File tree

1 file changed

+4
-6
lines changed
  • utils/swift_build_support/swift_build_support/products

1 file changed

+4
-6
lines changed

utils/swift_build_support/swift_build_support/products/llvm.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,10 @@ def build(self, host_target):
269269
'llvm-size'
270270
])
271271
else:
272-
build_targets = ['all']
272+
# We build LLVMTestingSupport unconditionally
273+
# to support scenarios where tests are run
274+
# outside of `build-script` (e.g. with `run-test`)
275+
build_targets = ['all', 'LLVMTestingSupport']
273276

274277
if self.args.llvm_ninja_targets_for_cross_compile_hosts and \
275278
self.is_cross_compile_target(host_target):
@@ -385,11 +388,6 @@ def build(self, host_target):
385388
if self.args.build_lld:
386389
llvm_enable_projects.append('lld')
387390

388-
if self.args.test:
389-
# LLVMTestingSupport is not built at part of `all`
390-
# and is required by some Swift tests
391-
build_targets.append('LLVMTestingSupport')
392-
393391
llvm_cmake_options.define('LLVM_ENABLE_PROJECTS',
394392
';'.join(llvm_enable_projects))
395393
llvm_cmake_options.define('LLVM_ENABLE_RUNTIMES',

0 commit comments

Comments
 (0)