Merge commit '83bbc0448110' from swift/release/6.2 into stable/20240723

git apple-llvm automerger · git apple-llvm automerger · commit 54eee003e08e · 2025-08-22T08:25:08.000-07:00
diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py
@@ -371,6 +371,7 @@ def delete_module_cache(path):
 # Some steps required to initialize the tests dynamically link with python.dll
 # and need to know the location of the Python libraries. This ensures that we
 # use the same version of Python that was used to build lldb to run our tests.
+config.environment["PYTHONHOME"] = config.python_root_dir
 config.environment["PATH"] = os.path.pathsep.join(
     (config.python_root_dir, config.environment.get("PATH", ""))
 )

Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,7 @@ def delete_module_cache(path):`
`371`	`371`	`# Some steps required to initialize the tests dynamically link with python.dll`
`372`	`372`	`# and need to know the location of the Python libraries. This ensures that we`
`373`	`373`	`# use the same version of Python that was used to build lldb to run our tests.`
	`374`	`+config.environment["PYTHONHOME"] = config.python_root_dir`
`374`	`375`	`config.environment["PATH"] = os.path.pathsep.join(`
`375`	`376`	`(config.python_root_dir, config.environment.get("PATH", ""))`
`376`	`377`	`)`