diff options
| author | Jason Molenda <jmolenda@apple.com> | 2025-10-03 15:53:24 -0700 |
|---|---|---|
| committer | Jason Molenda <jmolenda@apple.com> | 2025-10-03 15:54:25 -0700 |
| commit | 162b87b0ac86f7604db245b67874fc6715b2f06b (patch) | |
| tree | d41bc13f07b0ea8ca438b9fbe8734c418dda5061 /lldb/packages/Python/lldbsuite | |
| parent | fc1df44dec6396a468edab8136b1969eede54509 (diff) | |
| download | llvm-162b87b0ac86f7604db245b67874fc6715b2f06b.zip llvm-162b87b0ac86f7604db245b67874fc6715b2f06b.tar.gz llvm-162b87b0ac86f7604db245b67874fc6715b2f06b.tar.bz2 | |
[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.
Diffstat (limited to 'lldb/packages/Python/lldbsuite')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 2966ac0..e30d549 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -280,9 +280,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...") @@ -563,6 +560,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: |