mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate:launcher: Set more env variable in the launcher command desc

Browse source 
Summary:
Adding if present:
  * LD_PRELOAD
  * DISPLAY
  * GST_VALIDATE_CONFIG
  * GST_VALIDATE_OVERRIDE

+  enhance the add_env_variable method to more easily set envvar from
current value

Reviewers: Mathieu_Du

Differential Revision: http://phabricator.freedesktop.org/D78
This commit is contained in:
Thibault Saunier 2015-02-27 23:20:43 +00:00 committed by Thibault Saunier
parent 5d7403a6a5
commit 2cf082c4be
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
validate/launcher/apps/gstvalidate.py
View file

@ -410,6 +410,7 @@ class GstValidateMediaCheckTest(GstValidateTest):
self._media_info_path = minfo_path self._media_info_path = minfo_path
def build_arguments(self): def build_arguments(self):
Test.build_arguments(self)
self.add_arguments(self._uri, "--expected-results", self.add_arguments(self._uri, "--expected-results",
self._media_info_path) self._media_info_path)

16
validate/launcher/baseclasses.py
View file

@ -102,11 +102,17 @@ class Test(Loggable):
return string return string
def add_env_variable(self, variable, value): def add_env_variable(self, variable, value=None):
""" """
Only usefull so that the gst-validate-launcher can print the exact Only usefull so that the gst-validate-launcher can print the exact
right command line to reproduce the tests right command line to reproduce the tests
""" """
if value is None:
value = os.environ.get(variable, None)
if value is None:
return
if self._env_variable: if self._env_variable:
self._env_variable += " " self._env_variable += " "
self._env_variable += "%s=%s" % (variable, value) self._env_variable += "%s=%s" % (variable, value)
@ -160,7 +166,8 @@ class Test(Loggable):
self.command += " " + arg self.command += " " + arg
def build_arguments(self): def build_arguments(self):
pass self.add_env_variable("LD_PRELOAD")
self.add_env_variable("DISPLAY")
def set_result(self, result, message="", error=""): def set_result(self, result, message="", error=""):
self.debug("Setting result: %s (message: %s, error: %s)" % (result, self.debug("Setting result: %s (message: %s, error: %s)" % (result,
@ -455,6 +462,7 @@ class GstValidateTest(Test):
self._sent_eos_pos = None self._sent_eos_pos = None
def build_arguments(self): def build_arguments(self):
super(GstValidateTest, self).build_arguments()
if "GST_VALIDATE" in os.environ: if "GST_VALIDATE" in os.environ:
self.add_env_variable("GST_VALIDATE", os.environ["GST_VALIDATE"]) self.add_env_variable("GST_VALIDATE", os.environ["GST_VALIDATE"])
@ -466,8 +474,8 @@ class GstValidateTest(Test):
self.add_env_variable("GST_VALIDATE_SCENARIO", self.add_env_variable("GST_VALIDATE_SCENARIO",
os.environ["GST_VALIDATE_SCENARIO"]) os.environ["GST_VALIDATE_SCENARIO"])
if "LD_PRELOAD" in os.environ: self.add_env_variable("GST_VALIDATE_CONFIG")
self.add_env_variable("LD_PRELOAD", os.environ["LD_PRELOAD"]) self.add_env_variable("GST_VALIDATE_OVERRIDE")
def get_extra_log_content(self, extralog): def get_extra_log_content(self, extralog):
value = Test.get_extra_log_content(self, extralog) value = Test.get_extra_log_content(self, extralog)