Skip to content

Commit 388631e

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. (cherry picked from commit 162b87b)
1 parent 69d33cb commit 388631e

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
@@ -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:

0 commit comments

Comments
 (0)