https://github.com/Teemperor updated 
https://github.com/llvm/llvm-project/pull/206173

>From 6bc810c83c274ec29d19f4cb7f7ebba2d80df688 Mon Sep 17 00:00:00 2001
From: Raphael Isemann <[email protected]>
Date: Fri, 26 Jun 2026 21:22:21 +0100
Subject: [PATCH] [lldb][test] Require macOS 16 SDK or higher for
 import-std-module tests

Older macOS SDKs have Darwin modules that create cyclic dependencies
with the libc++ module since PR #141312.

These older SDKs are anyway not supported with a ToT libc++, so we
can just skip the test in this config.

assisted-by: claude
---
 .../Python/lldbsuite/test/decorators.py       | 27 +++++++++++++++++++
 .../array/TestArrayFromStdModule.py           |  1 +
 .../basic/TestImportStdModule.py              |  2 ++
 .../conflicts/TestStdModuleWithConflicts.py   |  1 +
 .../deque-basic/TestDequeFromStdModule.py     |  1 +
 .../TestDbgInfoContentDequeFromStdModule.py   |  1 +
 .../empty-module/TestEmptyStdModule.py        |  1 +
 .../TestForwardDeclFromStdModule.py           |  1 +
 ...tDbgInfoContentForwardListFromStdModule.py |  1 +
 .../TestForwardListFromStdModule.py           |  1 +
 .../iterator/TestIteratorFromStdModule.py     |  2 ++
 .../TestDbgInfoContentListFromStdModule.py    |  1 +
 .../list/TestListFromStdModule.py             |  1 +
 .../TestStdModuleSourcesMissing.py            |  1 +
 .../TestStdModuleBuildErrors.py               |  1 +
 .../no-std-module/TestMissingStdModule.py     |  1 +
 .../TestNonModuleTypeSeparation.py            |  1 +
 .../pair/TestPairFromStdModule.py             |  1 +
 .../queue/TestQueueFromStdModule.py           |  1 +
 .../TestRetryWithStdModule.py                 |  1 +
 ...estSharedPtrDbgInfoContentFromStdModule.py |  1 +
 .../shared_ptr/TestSharedPtrFromStdModule.py  |  1 +
 .../stack/TestStackFromStdModule.py           |  1 +
 .../sysroot/TestStdModuleSysroot.py           |  1 +
 .../TestUniquePtrDbgInfoContent.py            |  1 +
 .../unique_ptr/TestUniquePtrFromStdModule.py  |  1 +
 .../TestVectorBoolFromStdModule.py            |  1 +
 .../TestDbgInfoContentVectorFromStdModule.py  |  1 +
 .../TestVectorOfVectorsFromStdModule.py       |  1 +
 .../vector/TestVectorFromStdModule.py         |  1 +
 .../TestDbgInfoContentWeakPtrFromStdModule.py |  1 +
 .../weak_ptr/TestWeakPtrFromStdModule.py      |  1 +
 32 files changed, 60 insertions(+)

diff --git a/lldb/packages/Python/lldbsuite/test/decorators.py 
b/lldb/packages/Python/lldbsuite/test/decorators.py
index 43a5a1561563c..ec709e7a96932 100644
--- a/lldb/packages/Python/lldbsuite/test/decorators.py
+++ b/lldb/packages/Python/lldbsuite/test/decorators.py
@@ -78,6 +78,21 @@ def fn_neq(x, y):
     return op_lookup[comparison](version.parse(actual), 
version.parse(expected))
 
 
+def _get_macos_sdk_version() -> str | None:
+    """ Returns the current macOS SDK version or None if this system doesn't
+    use a macOS SDK."""
+    if platform.mac_ver()[0] == "":
+        return None
+    try:
+        return (
+            subprocess.check_output(["xcrun", "--sdk", "macosx", 
"--show-sdk-version"])
+            .rstrip()
+            .decode("utf-8")
+        )
+    except Exception:
+        return None
+
+
 def _match_decorator_property(expected, actual):
     if expected is None:
         return True
@@ -256,6 +271,7 @@ def _decorateTest(
     swig_version=None,
     py_version=None,
     macos_version=None,
+    macos_sdk_version=None,
     remote=None,
     dwarf_version=None,
     setting=None,
@@ -306,6 +322,12 @@ def fn(**actual_variants):
                 )
             )
         )
+        _sdk_ver = _get_macos_sdk_version()
+        skip_for_macos_sdk_version = macos_sdk_version is None
+        if macos_sdk_version is not None and _sdk_ver is not None:
+            skip_for_macos_sdk_version = _check_expected_version(
+                macos_sdk_version[0], macos_sdk_version[1], _sdk_ver
+            )
         skip_for_dwarf_version = (dwarf_version is None) or (
             _check_expected_version(
                 dwarf_version[0], dwarf_version[1], 
lldbplatformutil.getDwarfVersion()
@@ -327,6 +349,7 @@ def fn(**actual_variants):
             (swig_version, skip_for_swig_version, "swig version"),
             (py_version, skip_for_py_version, "python version"),
             (macos_version, skip_for_macos_version, "macOS version"),
+            (macos_sdk_version, skip_for_macos_sdk_version, "macOS SDK 
version"),
             (remote, skip_for_remote, "platform locality (remote/local)"),
             (dwarf_version, skip_for_dwarf_version, "dwarf version"),
             (setting, skip_for_setting, "setting"),
@@ -386,6 +409,7 @@ def expectedFailureAll(
     swig_version=None,
     py_version=None,
     macos_version=None,
+    macos_sdk_version=None,
     remote=None,
     dwarf_version=None,
     setting=None,
@@ -404,6 +428,7 @@ def expectedFailureAll(
         swig_version=swig_version,
         py_version=py_version,
         macos_version=macos_version,
+        macos_sdk_version=macos_sdk_version,
         remote=remote,
         dwarf_version=dwarf_version,
         setting=setting,
@@ -429,6 +454,7 @@ def skipIf(
     swig_version=None,
     py_version=None,
     macos_version=None,
+    macos_sdk_version=None,
     remote=None,
     dwarf_version=None,
     setting=None,
@@ -447,6 +473,7 @@ def skipIf(
         swig_version=swig_version,
         py_version=py_version,
         macos_version=macos_version,
+        macos_sdk_version=macos_sdk_version,
         remote=remote,
         dwarf_version=dwarf_version,
         setting=setting,
diff --git 
a/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py
index 4aea8009058b9..9fa1bd048252b 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py
@@ -14,6 +14,7 @@ class TestCase(TestBase):
     @skipIf(
         bugnumber="ASTImport of lambdas not supported: 
https://github.com/llvm/llvm-project/issues/149477";
     )
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/basic/TestImportStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/basic/TestImportStdModule.py
index 0c242d5c8845d..a99ea10ae9330 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/basic/TestImportStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/basic/TestImportStdModule.py
@@ -11,6 +11,7 @@ class ImportStdModule(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(macos_version=["<", "15.0"])
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
@@ -40,6 +41,7 @@ def test(self):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(macos_version=["<", "15.0"])
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test_non_cpp_language(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py
 
b/lldb/test/API/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py
index b3241aab72ab3..5bd319e94be6d 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py
@@ -16,6 +16,7 @@ class TestImportStdModuleConflicts(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(macos_version=["<", "15.0"])
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py
index 5e819b7f6e16f..ee4db68059c66 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py
@@ -14,6 +14,7 @@ class TestBasicDeque(TestBase):
     @skipIf(
         bugnumber="ASTImport of lambdas not supported: 
https://github.com/llvm/llvm-project/issues/149477";
     )
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py
index e8676b21bced3..338e39e2ad3a6 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py
@@ -15,6 +15,7 @@ class TestDbgInfoContentDeque(TestBase):
     @skipIf(
         bugnumber="ASTImport of lambdas not supported: 
https://github.com/llvm/llvm-project/issues/149477";
     )
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py
index 913d964578918..4273d80d96640 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py
@@ -15,6 +15,7 @@ class ImportStdModule(TestBase):
     @add_test_categories(["libc++"])
     @skipIfRemote
     @skipIf(compiler=no_match("clang"))
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/forward_decl_from_module/TestForwardDeclFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/forward_decl_from_module/TestForwardDeclFromStdModule.py
index f763111c871b9..465e62eac3527 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/forward_decl_from_module/TestForwardDeclFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/forward_decl_from_module/TestForwardDeclFromStdModule.py
@@ -15,6 +15,7 @@ class TestCase(TestBase):
     @add_test_categories(["libc++"])
     @skipIfRemote
     @skipIf(compiler=no_match("clang"))
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
index 1d0f9ccf18c61..da094d5d828d4 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
@@ -11,6 +11,7 @@ class TestDbgInfoContentForwardList(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(macos_version=["<", "15.0"])
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
index 9581155be2043..03cb539cd1f11 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
@@ -14,6 +14,7 @@ class TestBasicForwardList(TestBase):
     @skipIf(
         bugnumber="ASTImport of lambdas not supported: 
https://github.com/llvm/llvm-project/issues/149477";
     )
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/iterator/TestIteratorFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/iterator/TestIteratorFromStdModule.py
index f0b3b5445cf63..0502e7b4342c7 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/iterator/TestIteratorFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/iterator/TestIteratorFromStdModule.py
@@ -11,6 +11,7 @@ class TestCase(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(macos_version=["<", "15.0"])
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
@@ -30,6 +31,7 @@ def test(self):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     
@expectedFailureAll(bugnumber="https://github.com/llvm/llvm-project/issues/149477";)
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test_xfail(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
index 923551ca64c3d..6224982cf4908 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
@@ -16,6 +16,7 @@ class TestDbgInfoContentList(TestBase):
     @skipIf(
         bugnumber="ASTImport of lambdas not supported: 
https://github.com/llvm/llvm-project/issues/149477";
     )
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
index d6c88926e3e49..08b68d309a602 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
@@ -14,6 +14,7 @@ class TestBasicList(TestBase):
     @skipIf(
         bugnumber="ASTImport of lambdas not supported: 
https://github.com/llvm/llvm-project/issues/149477";
     )
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/missing-module-sources/TestStdModuleSourcesMissing.py
 
b/lldb/test/API/commands/expression/import-std-module/missing-module-sources/TestStdModuleSourcesMissing.py
index a039a3b184b24..ab0028cc63258 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/missing-module-sources/TestStdModuleSourcesMissing.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/missing-module-sources/TestStdModuleSourcesMissing.py
@@ -16,6 +16,7 @@ class TestCase(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIfRemote
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         # The path to our temporary target root that contains the temporary
         # module sources.
diff --git 
a/lldb/test/API/commands/expression/import-std-module/module-build-errors/TestStdModuleBuildErrors.py
 
b/lldb/test/API/commands/expression/import-std-module/module-build-errors/TestStdModuleBuildErrors.py
index aeb6263d49b0f..81f77a175d035 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/module-build-errors/TestStdModuleBuildErrors.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/module-build-errors/TestStdModuleBuildErrors.py
@@ -19,6 +19,7 @@ class TestCase(TestBase):
     @add_test_categories(["libc++"])
     @skipIfRemote
     @skipIf(compiler=no_match("clang"))
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py
index 4875ffb9bfbab..c400613045923 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py
@@ -16,6 +16,7 @@
 class STLTestCase(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py
 
b/lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py
index cc91ddcc538b7..358944817cce3 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py
@@ -12,6 +12,7 @@ class TestCase(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(macos_version=["<", "15.0"])
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         """
         This test is creating ValueObjects with both C++ module and debug
diff --git 
a/lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py
index 2d314ec2582c3..a2e7a0aff410c 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py
@@ -14,6 +14,7 @@ class TestCase(TestBase):
     # but needs further investigation for what underlying Clang/LLDB bug can't
     # handle that code change.
     @skip
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
index 95aaa8e7aac88..c4a08a9325641 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
@@ -19,6 +19,7 @@ class TestQueue(TestBase):
         compiler="clang",
         compiler_version=["<", "17.0"],
     )
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py
index d003558f812d8..d15566bf172d9 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py
@@ -7,6 +7,7 @@ class TestCase(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(macos_version=["<", "15.0"])
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py
index 5bfdb9baf663c..78922469592f4 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py
@@ -11,6 +11,7 @@ class TestSharedPtrDbgInfoContent(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(macos_version=["<", "15.0"])
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py
index 2096c184ab06d..3ea28fbf677af 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py
@@ -13,6 +13,7 @@ class TestSharedPtr(TestBase):
     @skipIf(macos_version=["<", "15.0"])
     @skipIf(compiler="clang", compiler_version=["<", "17.0"])
     @skipIf(bugnumber="https://llvm.org/PR200154";)
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/stack/TestStackFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/stack/TestStackFromStdModule.py
index bc0e7f473e66a..77420a6022710 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/stack/TestStackFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/stack/TestStackFromStdModule.py
@@ -12,6 +12,7 @@ class TestStack(TestBase):
     @skipIf(compiler=no_match("clang"))
     @skipIfLinux  # Declaration in some Linux headers causes LLDB to crash.
     @skipIf(bugnumber="rdar://97622854")
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py
 
b/lldb/test/API/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py
index a4ad4d3fdfada..e6147e724f04c 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py
@@ -15,6 +15,7 @@ class ImportStdModule(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIfRemote  # This test messes with the platform, can't be run remotely.
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
 
b/lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
index 39b720b895fe4..c46aba4a8a4f8 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
@@ -13,6 +13,7 @@ class TestUniquePtrDbgInfoContent(TestBase):
     @skipIf(compiler="clang", compiler_version=["<", "9.0"])
     @skipIf(macos_version=["<", "15.0"])
     @skipIfLinux  # s.reset() causes link errors on ubuntu 18.04/Clang 9
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py
index 90384d5e96a22..0e1ab165b3ed8 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py
@@ -13,6 +13,7 @@ class TestUniquePtr(TestBase):
     @skipIf(compiler="clang", compiler_version=["<", "9.0"])
     @skipIf(macos_version=["<", "15.0"])
     @skipIfLinux  # s.reset() causes link errors on ubuntu 18.04/Clang 9
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py
index 6caec20b967de..146cab764504f 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py
@@ -11,6 +11,7 @@ class TestBoolVector(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(bugnumber="rdar://100741983")
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
index 5f43fa1ea5662..00b151d691981 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
@@ -16,6 +16,7 @@ class TestDbgInfoContentVector(TestBase):
     @skipIf(
         bugnumber="ASTImport of lambdas not supported: 
https://github.com/llvm/llvm-project/issues/149477";
     )
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
index f0eb4758ca54b..aa9b5cb20c87c 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
@@ -14,6 +14,7 @@ class TestVectorOfVectors(TestBase):
     @skipIf(
         bugnumber="ASTImport of lambdas not supported: 
https://github.com/llvm/llvm-project/issues/149477";
     )
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py
index 78ecdcb5f0338..89fbb8404509d 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py
@@ -11,6 +11,7 @@ class TestBasicVector(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(bugnumber="rdar://100741983")
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py
index 28edf1999362e..e06775f052e7c 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py
@@ -12,6 +12,7 @@ class TestDbgInfoContentWeakPtr(TestBase):
     @skipIf(compiler=no_match("clang"))
     @skipIf(compiler="clang", compiler_version=["<", "17.0"])
     @skipIf(macos_version=["<", "15.0"])
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 
diff --git 
a/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py
 
b/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py
index e3d3cf1622f0e..9cc52ac688585 100644
--- 
a/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py
+++ 
b/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py
@@ -13,6 +13,7 @@ class TestSharedPtr(TestBase):
     @skipIf(compiler="clang", compiler_version=["<", "17.0"])
     @skipIf(macos_version=["<", "15.0"])
     @skipIf(bugnumber="https://llvm.org/PR200154";)
+    @skipIf(macos_sdk_version=["<", "16.0"])
     def test(self):
         self.build()
 

_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to