Skip to content

Commit b7b910b

Browse files
authored
Merge pull request #11569 from jasonmolenda/cp/r160698393-fix-yaml2macho-core-path
Cp/r160698393 fix yaml2macho core path
2 parents 69d33cb + 0fb3778 commit b7b910b

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

lldb/packages/Python/lldbsuite/test/dotest.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,6 @@ def parseOptionsAndInitTestdirs():
279279
configuration.llvm_tools_dir = args.llvm_tools_dir
280280
configuration.filecheck = shutil.which("FileCheck", path=args.llvm_tools_dir)
281281
configuration.yaml2obj = shutil.which("yaml2obj", path=args.llvm_tools_dir)
282-
configuration.yaml2macho_core = shutil.which(
283-
"yaml2macho-core", path=args.llvm_tools_dir
284-
)
285282

286283
if not configuration.get_filecheck_path():
287284
logging.warning("No valid FileCheck executable; some tests may fail...")
@@ -561,6 +558,8 @@ def setupSysPath():
561558
if is_exe(lldbDAPExec):
562559
os.environ["LLDBDAP_EXEC"] = lldbDAPExec
563560

561+
configuration.yaml2macho_core = shutil.which("yaml2macho-core", path=lldbDir)
562+
564563
lldbPythonDir = None # The directory that contains 'lldb/__init__.py'
565564

566565
# If our lldb supports the -P option, use it to find the python path:

lldb/test/API/functionalities/unwind/cortex-m-exception/TestCortexMExceptionUnwind.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from lldbsuite.test.lldbtest import *
99
from lldbsuite.test import lldbutil
1010

11-
@skipIf(bugnumber = "rdar://160698191")
1211
class TestCortexMExceptionUnwind(TestBase):
1312
NO_DEBUG_INFO_TESTCASE = True
1413

lldb/test/API/macosx/arm-corefile-regctx/TestArmMachoCorefileRegctx.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from lldbsuite.test.lldbtest import *
1010
from lldbsuite.test import lldbutil
1111

12-
@skipIf(bugnumber = "rdar://160698553")
1312
class TestArmMachoCorefileRegctx(TestBase):
1413
NO_DEBUG_INFO_TESTCASE = True
1514

lldb/test/API/macosx/riscv32-corefile/TestRV32MachOCorefile.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from lldbsuite.test.lldbtest import *
1010
from lldbsuite.test import lldbutil
1111

12-
@skipIf(bugnumber = "rdar://160698393")
1312
class TestRV32MachOCorefile(TestBase):
1413
NO_DEBUG_INFO_TESTCASE = True
1514

0 commit comments

Comments
 (0)