mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-30 04:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate:launcher: Pass GST_VALIDATE_SCENARIO to the subprocess env only

Browse source 
Summary:
And make sure to remove it from the env if the user has it in its main
environment.

Without that commit we ended up passing scenarios from previous tests
to the following ones where None were specified.

Reviewers: Mathieu_Du

Differential Revision: http://phabricator.freedesktop.org/D98
This commit is contained in:
Thibault Saunier 2015-04-16 12:02:11 +02:00
parent abb9e0ff2a
commit adbe811175
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
validate/launcher/baseclasses.py
View file

@ -459,6 +459,16 @@ class GstValidateTest(Test):
subproc_env['GST_GL_XINITTHREADS'] = '1' subproc_env['GST_GL_XINITTHREADS'] = '1'
self.add_env_variable('GST_GL_XINITTHREADS', '1') self.add_env_variable('GST_GL_XINITTHREADS', '1')
if self.scenario is not None:
subproc_env["GST_VALIDATE_SCENARIO"] = self.scenario.get_execution_name()
self.add_env_variable("GST_VALIDATE_SCENARIO",
subproc_env["GST_VALIDATE_SCENARIO"])
else:
try:
del subproc_env["GST_VALIDATE_SCENARIO"]
except KeyError:
pass
return subproc_env return subproc_env
def clean(self): def clean(self):
@ -473,10 +483,6 @@ class GstValidateTest(Test):
if "GST_VALIDATE_SCENARIOS_PATH" in os.environ: if "GST_VALIDATE_SCENARIOS_PATH" in os.environ:
self.add_env_variable("GST_VALIDATE_SCENARIOS_PATH", self.add_env_variable("GST_VALIDATE_SCENARIOS_PATH",
os.environ["GST_VALIDATE_SCENARIOS_PATH"]) os.environ["GST_VALIDATE_SCENARIOS_PATH"])
if self.scenario is not None:
os.environ["GST_VALIDATE_SCENARIO"] = self.scenario.get_execution_name()
self.add_env_variable("GST_VALIDATE_SCENARIO",
os.environ["GST_VALIDATE_SCENARIO"])
self.add_env_variable("GST_VALIDATE_CONFIG") self.add_env_variable("GST_VALIDATE_CONFIG")
self.add_env_variable("GST_VALIDATE_OVERRIDE") self.add_env_variable("GST_VALIDATE_OVERRIDE")