Skip to content

Commit b36cbed

Browse files
authored
Merge pull request #41266 from ahoppen/pr/dont-clean-sourcekitlsp
[Build System] Don't clean sourcekit-lsp prior to running tests
2 parents 3c0b1ab + 7712387 commit b36cbed

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

utils/swift_build_support/swift_build_support/products/indexstoredb.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def get_dependencies(cls):
7676

7777

7878
def run_build_script_helper(action, host_target, product, args,
79-
sanitize_all=False):
79+
sanitize_all=False, clean=True):
8080
script_path = os.path.join(
8181
product.source_dir, 'Utilities', 'build-script-helper.py')
8282

@@ -105,6 +105,9 @@ def run_build_script_helper(action, host_target, product, args,
105105
elif args.enable_tsan:
106106
helper_cmd.extend(['--sanitize', 'thread'])
107107

108+
if not clean:
109+
helper_cmd.append('--no-clean')
110+
108111
if not product.is_darwin_host(
109112
host_target) and product.is_cross_compile_target(host_target):
110113
helper_cmd.extend(['--cross-compile-host', host_target])

utils/swift_build_support/swift_build_support/products/sourcekitlsp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ def should_test(self, host_target):
5050
def test(self, host_target):
5151
indexstoredb.run_build_script_helper(
5252
'test', host_target, self, self.args,
53-
self.args.test_sourcekitlsp_sanitize_all)
53+
self.args.test_sourcekitlsp_sanitize_all, clean=False)
5454

5555
def should_install(self, host_target):
5656
return self.args.install_sourcekitlsp
5757

5858
def install(self, host_target):
5959
indexstoredb.run_build_script_helper(
60-
'install', host_target, self, self.args)
60+
'install', host_target, self, self.args, clean=False)
6161

6262
@classmethod
6363
def get_dependencies(cls):

0 commit comments

Comments
 (0)