Skip to content

Commit 162b87b

Browse files
committed
[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.
1 parent fc1df44 commit 162b87b

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

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

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

287284
if not configuration.get_filecheck_path():
288285
logging.warning("No valid FileCheck executable; some tests may fail...")
@@ -563,6 +560,8 @@ def setupSysPath():
563560
if is_exe(lldbDAPExec):
564561
os.environ["LLDBDAP_EXEC"] = lldbDAPExec
565562

563+
configuration.yaml2macho_core = shutil.which("yaml2macho-core", path=lldbDir)
564+
566565
lldbPythonDir = None # The directory that contains 'lldb/__init__.py'
567566

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

0 commit comments

Comments
 (0)