From 388631e839b1a59c22ac6ff35efeb0a15815d8ac Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Fri, 3 Oct 2025 15:53:24 -0700 Subject: [PATCH 1/2] [lldb][yaml2macho-core] Set binary path for tests differently The way I was setting the path to the yaml2macho-core tool for API tests assumed that the llvm tool bin directory was the same as the lldb tool bin directory. There are build configuration styles where they are not. Set it the same way lldb-dap etc are set to the lldb bin dir. (cherry picked from commit 162b87b0ac86f7604db245b67874fc6715b2f06b) --- lldb/packages/Python/lldbsuite/test/dotest.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 24c6fe194385a..d5f4219eeafcf 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -279,9 +279,6 @@ def parseOptionsAndInitTestdirs(): configuration.llvm_tools_dir = args.llvm_tools_dir configuration.filecheck = shutil.which("FileCheck", path=args.llvm_tools_dir) configuration.yaml2obj = shutil.which("yaml2obj", path=args.llvm_tools_dir) - configuration.yaml2macho_core = shutil.which( - "yaml2macho-core", path=args.llvm_tools_dir - ) if not configuration.get_filecheck_path(): logging.warning("No valid FileCheck executable; some tests may fail...") @@ -561,6 +558,8 @@ def setupSysPath(): if is_exe(lldbDAPExec): os.environ["LLDBDAP_EXEC"] = lldbDAPExec + configuration.yaml2macho_core = shutil.which("yaml2macho-core", path=lldbDir) + lldbPythonDir = None # The directory that contains 'lldb/__init__.py' # If our lldb supports the -P option, use it to find the python path: From 0fb3778ca409e96e0a5d7bf345ed0d595abc8c40 Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Fri, 3 Oct 2025 19:54:27 -0700 Subject: [PATCH 2/2] [lldb] remove test skips from yaml2macho-core tests --- .../unwind/cortex-m-exception/TestCortexMExceptionUnwind.py | 1 - .../API/macosx/arm-corefile-regctx/TestArmMachoCorefileRegctx.py | 1 - lldb/test/API/macosx/riscv32-corefile/TestRV32MachOCorefile.py | 1 - 3 files changed, 3 deletions(-) diff --git a/lldb/test/API/functionalities/unwind/cortex-m-exception/TestCortexMExceptionUnwind.py b/lldb/test/API/functionalities/unwind/cortex-m-exception/TestCortexMExceptionUnwind.py index 1a1f98ceb009f..a4dc69617c1d3 100644 --- a/lldb/test/API/functionalities/unwind/cortex-m-exception/TestCortexMExceptionUnwind.py +++ b/lldb/test/API/functionalities/unwind/cortex-m-exception/TestCortexMExceptionUnwind.py @@ -8,7 +8,6 @@ from lldbsuite.test.lldbtest import * from lldbsuite.test import lldbutil -@skipIf(bugnumber = "rdar://160698191") class TestCortexMExceptionUnwind(TestBase): NO_DEBUG_INFO_TESTCASE = True diff --git a/lldb/test/API/macosx/arm-corefile-regctx/TestArmMachoCorefileRegctx.py b/lldb/test/API/macosx/arm-corefile-regctx/TestArmMachoCorefileRegctx.py index 03da4c11781f6..5599f3a347516 100644 --- a/lldb/test/API/macosx/arm-corefile-regctx/TestArmMachoCorefileRegctx.py +++ b/lldb/test/API/macosx/arm-corefile-regctx/TestArmMachoCorefileRegctx.py @@ -9,7 +9,6 @@ from lldbsuite.test.lldbtest import * from lldbsuite.test import lldbutil -@skipIf(bugnumber = "rdar://160698553") class TestArmMachoCorefileRegctx(TestBase): NO_DEBUG_INFO_TESTCASE = True diff --git a/lldb/test/API/macosx/riscv32-corefile/TestRV32MachOCorefile.py b/lldb/test/API/macosx/riscv32-corefile/TestRV32MachOCorefile.py index c13bfbfd795b9..6a631c493bc11 100644 --- a/lldb/test/API/macosx/riscv32-corefile/TestRV32MachOCorefile.py +++ b/lldb/test/API/macosx/riscv32-corefile/TestRV32MachOCorefile.py @@ -9,7 +9,6 @@ from lldbsuite.test.lldbtest import * from lldbsuite.test import lldbutil -@skipIf(bugnumber = "rdar://160698393") class TestRV32MachOCorefile(TestBase): NO_DEBUG_INFO_TESTCASE = True