Skip to content

Commit 18561a6

Browse files
Merge pull request swiftlang#9311 from adrian-prantl/asan-skip1
Skip libsanitizer test on older versions of macOS
2 parents b867e31 + efb1df0 commit 18561a6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lldb/test/API/functionalities/asan/swift/TestAsanSwift.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Test Swift support of ASan.
1414
"""
1515
import lldb
16-
import lldbsuite.test.decorators as decorators
16+
from lldbsuite.test.decorators import *
1717
import lldbsuite.test.lldbtest as lldbtest
1818
import lldbsuite.test.lldbutil as lldbutil
1919
from lldbsuite.test_event.build_exception import BuildError
@@ -25,14 +25,15 @@ class AsanSwiftTestCase(lldbtest.TestBase):
2525

2626
mydir = lldbtest.TestBase.compute_mydir(__file__)
2727

28-
@decorators.swiftTest
29-
@decorators.skipIfLinux
30-
@decorators.skipUnlessSwiftAddressSanitizer
28+
@swiftTest
29+
@skipIfLinux
30+
@skipUnlessSwiftAddressSanitizer
3131
def test_asan_swift(self):
3232
self.build(make_targets=["asan"])
3333
self.do_test_asan()
3434

35-
@decorators.skipIf(oslist=decorators.no_match(["macosx"]))
35+
@skipIf(oslist=no_match(["macosx"]))
36+
@skipIf(macos_version=["<", "15.0"])
3637
def test_libsanitizers_swift(self):
3738
try:
3839
self.build(make_targets=["libsanitizers"])
@@ -43,7 +44,6 @@ def test_libsanitizers_swift(self):
4344
def setUp(self):
4445
lldbtest.TestBase.setUp(self)
4546
self.main_source = "main.swift"
46-
self.main_source_spec = lldb.SBFileSpec(self.main_source)
4747
self.line_breakpoint = lldbtest.line_number(
4848
self.main_source, '// breakpoint')
4949

0 commit comments

Comments
 (0)