backends: allow LD_LIBRARY_PATH to be overwritten in test environments

pull/14293/head
sanana 2 weeks ago
parent df79a51571
commit 50d32028d7
No known key found for this signature in database
GPG Key ID: 4679BF7DCC044783
  1. 2
      mesonbuild/backend/backends.py
  2. 3
      mesonbuild/utils/core.py

@ -1295,7 +1295,7 @@ class Backend:
env_build_dir = self.environment.get_build_dir()
ld_lib_path: T.Set[str] = set(os.path.join(env_build_dir, l.get_subdir()) for l in ld_lib_path_libs)
if ld_lib_path:
if ld_lib_path and not t_env.has_name('LD_LIBRARY_PATH') and not t_env.is_unset('LD_LIBRARY_PATH'):
t_env.prepend('LD_LIBRARY_PATH', list(ld_lib_path), ':')
ts = TestSerialisation(t.get_name(), t.project_name, t.suite, cmd, is_cross,

@ -87,6 +87,9 @@ class EnvironmentVariables(HoldableObject):
def has_name(self, name: str) -> bool:
return name in self.varnames
def is_unset(self, name: str) -> bool:
return name in self.unset_vars
def get_names(self) -> T.Set[str]:
return self.varnames

Loading…
Cancel
Save