mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 08:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: Make sure to update children environment from current env

Browse source 
And minor fix in function call
This commit is contained in:
Thibault Saunier 2017-01-06 12:09:13 -03:00
parent 30221faa32
commit de2cbda854
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
validate/launcher/apps/gstcheck.py
View file

@ -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'] + \

2
validate/launcher/baseclasses.py
View file

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