validate: rename get_valgrind_suppression_file()

Summary:
This function is actually not specific to valgrind so we can make it more
generic.

Reviewers: thiblahute

Differential Revision: http://phabricator.freedesktop.org/D162
This commit is contained in:
Guillaume Desmottes 2015-05-11 12:22:25 +02:00 committed by Thibault Saunier
parent 2760da33a3
commit f6681ff003
3 changed files with 7 additions and 5 deletions

View file

@ -30,7 +30,7 @@ from launcher.baseclasses import GstValidateTest, Test, \
GstValidateBaseTestManager, MediaDescriptor, MediaFormatCombination
from launcher.utils import path2url, DEFAULT_TIMEOUT, which, \
GST_SECOND, Result, Protocols, mkdir, printc, Colors, get_valgrind_suppression_file
GST_SECOND, Result, Protocols, mkdir, printc, Colors, get_data_file
#
# Private global variables #
@ -541,7 +541,7 @@ not been tested and explicitely activated if you set use --wanted-tests ALL""")
def print_valgrind_bugs(self):
# Look for all the 'pending' bugs in our supp file
bugs = []
p = get_valgrind_suppression_file('data', 'gstvalidate.supp')
p = get_data_file('data', 'gstvalidate.supp')
with open(p) as f:
for l in f.readlines():
l = l.strip()

View file

@ -36,7 +36,7 @@ from loggable import Loggable
import xml.etree.cElementTree as ET
from utils import mkdir, Result, Colors, printc, DEFAULT_TIMEOUT, GST_SECOND, \
Protocols, look_for_file_in_source_dir, get_valgrind_suppression_file
Protocols, look_for_file_in_source_dir, get_data_file
# The factor by which we increase the hard timeout when running inside
# Valgrind
@ -632,7 +632,7 @@ class GstValidateTest(Test):
return position
def get_valgrind_suppression_file(self, subdir, name):
p = get_valgrind_suppression_file(subdir, name)
p = get_data_file(subdir, name)
if p:
return p

View file

@ -192,7 +192,9 @@ def look_for_file_in_source_dir(subdir, name):
return None
def get_valgrind_suppression_file(subdir, name):
# Returns the path $top_src_dir/@subdir/@name if running from source, or
# $DATADIR/gstreamer-1.0/validate/@name if not
def get_data_file(subdir, name):
# Are we running from sources?
p = look_for_file_in_source_dir(subdir, name)
if p: