mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-21 05:26:23 +00:00
validate: Make sure to update children environment from current env
And minor fix in function call
This commit is contained in:
parent
30221faa32
commit
de2cbda854
2 changed files with 7 additions and 3 deletions
|
@ -31,10 +31,14 @@ from launcher.utils import printc, Colors
|
|||
class MesonTest(Test):
|
||||
|
||||
def __init__(self, name, options, reporter, test, child_env=None):
|
||||
ref_env = os.environ
|
||||
if child_env is None:
|
||||
child_env = dict()
|
||||
child_env = {}
|
||||
else:
|
||||
ref_env.update(child_env)
|
||||
|
||||
if not isinstance(test.env, dict):
|
||||
test.env = test.env.get_env(child_env)
|
||||
test.env = test.env.get_env(ref_env)
|
||||
child_env.update(test.env)
|
||||
if len(test.extra_paths) > 0:
|
||||
child_env['PATH'] = child_env['PATH'] + \
|
||||
|
|
|
@ -255,7 +255,7 @@ class Test(Loggable):
|
|||
if self.process.returncode == 0:
|
||||
self.set_result(Result.PASSED)
|
||||
elif self.process.returncode in [-signal.SIGSEGV, -signal.SIGABRT, 139]:
|
||||
self.add_stack_trace_to_file()
|
||||
self.add_stack_trace_to_logfile()
|
||||
self.set_result(Result.FAILED,
|
||||
"Application segfaulted, returne code: %d" % (
|
||||
self.process.returncode))
|
||||
|
|
Loading…
Reference in a new issue