mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-28 17:25:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate:launcher: Stop running test subprocesses in a shell

Browse source 
And instead properly use a list of argument for the subprocesses.
This commit is contained in:
Thibault Saunier 2016-12-22 10:07:58 -03:00
parent 013b747404
commit 26692e749c
2 changed files with 32 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import argparse
import os import os
import time import time
import urllib.parse import urllib.parse
import shlex
import subprocess import subprocess
import configparser import configparser
from launcher.loggable import Loggable from launcher.loggable import Loggable
@ -411,10 +412,10 @@ class GstValidateLaunchTest(GstValidateTest):
def build_arguments(self): def build_arguments(self):
GstValidateTest.build_arguments(self) GstValidateTest.build_arguments(self)
self.add_arguments(self.pipeline_desc) self.add_arguments(*shlex.split(self.pipeline_desc))
if self.media_descriptor is not None and self.media_descriptor.get_path(): if self.media_descriptor is not None and self.media_descriptor.get_path():
self.add_arguments( self.add_arguments(
"--set-media-info", '"' + self.media_descriptor.get_path() + '"') "--set-media-info", self.media_descriptor.get_path())
class GstValidateMediaCheckTest(GstValidateTest): class GstValidateMediaCheckTest(GstValidateTest):
@ -437,8 +438,7 @@ class GstValidateMediaCheckTest(GstValidateTest):
def build_arguments(self): def build_arguments(self):
Test.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 + '"')
class GstValidateTranscodingTest(GstValidateTest, GstValidateEncodingTestInterface): class GstValidateTranscodingTest(GstValidateTest, GstValidateEncodingTestInterface):
@ -500,7 +500,7 @@ class GstValidateTranscodingTest(GstValidateTest, GstValidateEncodingTestInterfa
def build_arguments(self): def build_arguments(self):
GstValidateTest.build_arguments(self) GstValidateTest.build_arguments(self)
self.set_rendering_info() self.set_rendering_info()
self.add_arguments(self.uri, '"' + self.dest_file + '"') self.add_arguments(self.uri, self.dest_file)
def get_current_value(self): def get_current_value(self):
if self.scenario: if self.scenario:

56
validate/launcher/baseclasses.py
View file

@ -75,7 +75,7 @@ class Test(Loggable):
self.classname = classname self.classname = classname
self.options = options self.options = options
self.application = application_name self.application = application_name
self.command = "" self.command = []
self.reporter = reporter self.reporter = reporter
self.process = None self.process = None
self.proc_env = None self.proc_env = None
@ -115,7 +115,7 @@ class Test(Loggable):
if self.result in [Result.FAILED, Result.TIMEOUT]: if self.result in [Result.FAILED, Result.TIMEOUT]:
string += " '%s'\n" \ string += " '%s'\n" \
" You can reproduce with: %s %s\n" \ " You can reproduce with: %s %s\n" \
% (self.message, self._env_variable, self.command) % (self.message, self._env_variable, ' '.join(self.command))
if not self.options.redirect_logs: if not self.options.redirect_logs:
string += " You can find logs in:\n" \ string += " You can find logs in:\n" \
@ -146,7 +146,7 @@ class Test(Loggable):
res += " " res += " "
value = self.proc_env.get(var, None) value = self.proc_env.get(var, None)
if value: if value:
res += "%s=%s" % (var, value) res += "%s='%s'" % (var, value)
return res return res
@ -195,8 +195,7 @@ class Test(Loggable):
return self.classname.split('.')[-1] return self.classname.split('.')[-1]
def add_arguments(self, *args): def add_arguments(self, *args):
for arg in args: self.command += args
self.command += " " + arg
def build_arguments(self): def build_arguments(self):
self.add_env_variable("LD_PRELOAD") self.add_env_variable("LD_PRELOAD")
@ -345,10 +344,9 @@ class Test(Loggable):
res = self.process.poll() res = self.process.poll()
def thread_wrapper(self): def thread_wrapper(self):
self.process = subprocess.Popen("exec " + self.command, self.process = subprocess.Popen(self.command,
stderr=self.out, stderr=self.out,
stdout=self.out, stdout=self.out,
shell=True,
env=self.proc_env) env=self.proc_env)
self.process.wait() self.process.wait()
if self.result is not Result.TIMEOUT: if self.result is not Result.TIMEOUT:
@ -361,31 +359,32 @@ class Test(Loggable):
if self.hard_timeout is not None: if self.hard_timeout is not None:
self.hard_timeout *= GDB_TIMEOUT_FACTOR self.hard_timeout *= GDB_TIMEOUT_FACTOR
self.timeout *= GDB_TIMEOUT_FACTOR self.timeout *= GDB_TIMEOUT_FACTOR
self.command = "gdb -ex run -ex quit --args %s" % self.command self.command = ["gdb", "-ex", "run", "-ex", "quit",
"--args"] + self.command
def use_valgrind(self): def use_valgrind(self):
vglogsfile = self.logfile + '.valgrind' vglogsfile = self.logfile + '.valgrind'
self.extra_logfiles.append(vglogsfile) self.extra_logfiles.append(vglogsfile)
vg_args = [ vg_args = []
('trace-children', 'yes'),
('tool', 'memcheck'), for o, v in [('trace-children', 'yes'),
('leak-check', 'full'), ('tool', 'memcheck'),
('leak-resolution', 'high'), ('leak-check', 'full'),
# TODO: errors-for-leak-kinds should be set to all instead of definite ('leak-resolution', 'high'),
# and all false positives should be added to suppression files. # TODO: errors-for-leak-kinds should be set to all instead of definite
('errors-for-leak-kinds', 'definite'), # and all false positives should be added to suppression files.
('num-callers', '20'), ('errors-for-leak-kinds', 'definite'),
('log-file', '"' + vglogsfile + '"'), ('num-callers', '20'),
('error-exitcode', str(VALGRIND_ERROR_CODE)), ('log-file', vglogsfile),
('gen-suppressions', 'all'), ('error-exitcode', str(VALGRIND_ERROR_CODE)),
] ('gen-suppressions', 'all')]:
vg_args.append("--%s=%s" % (o, v))
for supp in self.get_valgrind_suppressions(): for supp in self.get_valgrind_suppressions():
vg_args.append(('suppressions', supp)) vg_args.append("--suppressions=%s" % supp)
self.command = "valgrind %s %s" % (' '.join(['--%s=%s' % (x[0], x[1]) for x in vg_args]), self.command = ["valgrind"] + vg_args + self.command
self.command)
# Tune GLib's memory allocator to be more valgrind friendly # Tune GLib's memory allocator to be more valgrind friendly
self.proc_env['G_DEBUG'] = 'gc-friendly' self.proc_env['G_DEBUG'] = 'gc-friendly'
@ -412,7 +411,7 @@ class Test(Loggable):
self.open_logfile() self.open_logfile()
self.queue = queue self.queue = queue
self.command = "%s " % (self.application) self.command = [self.application]
self._starting_time = time.time() self._starting_time = time.time()
self.build_arguments() self.build_arguments()
self.proc_env = self.get_subproc_env() self.proc_env = self.get_subproc_env()
@ -430,7 +429,7 @@ class Test(Loggable):
message = "Launching: %s%s\n" \ message = "Launching: %s%s\n" \
" Command: '%s %s'\n" % (Colors.ENDC, self.classname, " Command: '%s %s'\n" % (Colors.ENDC, self.classname,
self._env_variable, self.command) self._env_variable, ' '.join(self.command))
if not self.options.redirect_logs: if not self.options.redirect_logs:
message += " Logs:\n" \ message += " Logs:\n" \
" - %s" % (self.logfile) " - %s" % (self.logfile)
@ -441,7 +440,7 @@ class Test(Loggable):
"Test name: %s\n" "Test name: %s\n"
"Command: '%s'\n" "Command: '%s'\n"
"=================\n\n" "=================\n\n"
% (self.classname, self.command)) % (self.classname, ' '.join(self.command)))
self.out.flush() self.out.flush()
printc(message, Colors.OKBLUE) printc(message, Colors.OKBLUE)
@ -888,7 +887,7 @@ class GstValidateEncodingTestInterface(object):
def _get_profile_full(self, muxer, venc, aenc, video_restriction=None, def _get_profile_full(self, muxer, venc, aenc, video_restriction=None,
audio_restriction=None, audio_presence=0, audio_restriction=None, audio_presence=0,
video_presence=0): video_presence=0):
ret = "\"" ret = ""
if muxer: if muxer:
ret += muxer ret += muxer
ret += ":" ret += ":"
@ -906,7 +905,6 @@ class GstValidateEncodingTestInterface(object):
if audio_presence: if audio_presence:
ret = ret + '|' + str(audio_presence) ret = ret + '|' + str(audio_presence)
ret += "\""
return ret.replace("::", ":") return ret.replace("::", ":")
def get_profile(self, video_restriction=None, audio_restriction=None): def get_profile(self, video_restriction=None, audio_restriction=None):