Skip to content

Commit ff20ea9

Browse files
authored
Merge pull request #3474 from apple/lldb-Disable-swift-create-module-contexts-in-parallel-for-a-few-tests
[lldb] Disable swift-create-module-contexts-in-parallel for a few tests
2 parents 818339f + c81320b commit ff20ea9

File tree

7 files changed

+17
-0
lines changed

7 files changed

+17
-0
lines changed

lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ def setUp(self):
2828

2929
def provider_data_formatter_commands(self):
3030
"""Test that the PythonObjectSyntheticChildProvider helper class works"""
31+
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
32+
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
3133
self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
3234

3335
lldbutil.run_break_set_by_file_and_line(

lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ def test(self):
4545

4646
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
4747
% mod_cache)
48+
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
49+
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
4850
self.build()
4951
target, _, _, _ = lldbutil.run_to_source_breakpoint(self, "break here",
5052
lldb.SBFileSpec('main.swift'),

lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ def test(self):
3838
self.runCmd("settings set symbols.use-swift-dwarfimporter false")
3939
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
4040
% mod_cache)
41+
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
42+
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
4143
self.build()
4244

4345
target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(

lldb/test/API/lang/swift/clangimporter/macro_conflict/TestSwiftMacroConflict.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ def test(self):
3838
self.runCmd('settings set symbols.use-swift-dwarfimporter false')
3939
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
4040
% mod_cache)
41+
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
42+
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
4143
self.build()
4244

4345
target, process, _, _ = lldbutil.run_to_source_breakpoint(
@@ -77,6 +79,9 @@ def test_with_dwarfimporter(self):
7779
self.runCmd('settings set symbols.use-swift-dwarfimporter true')
7880
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
7981
% mod_cache)
82+
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
83+
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
84+
8085
self.build()
8186

8287
target, process, _, _ = lldbutil.run_to_source_breakpoint(

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/TestSwiftObjCMainConflictingDylibs.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ def test(self):
3737

3838
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
3939
% mod_cache)
40+
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
41+
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
4042
self.build()
4143
target, process, _, foo_breakpoint = lldbutil.run_to_source_breakpoint(
4244
self, 'break here', lldb.SBFileSpec('Foo.swift'),

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ def test(self):
3737

3838
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
3939
% mod_cache)
40+
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
41+
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
4042
self.build()
4143

4244
target, process, _, bar_breakpoint = lldbutil.run_to_source_breakpoint(

lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ def dotest(self, remap):
6060
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
6161
% mod_cache)
6262
self.runCmd("settings set symbols.use-swift-dwarfimporter false")
63+
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
64+
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
6365

6466
botdir = os.path.realpath(self.getBuildArtifact("buildbot"))
6567
userdir = os.path.realpath(self.getBuildArtifact("user"))

0 commit comments

Comments
 (0)