mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-31 19:42:26 +00:00
validate: Ensure non-standard testsuite location is taken into account
This is a regression that was introduced by 6504b9152c
If we have non-standard main_dir or qa_assets, make sure we prepend the
checked-out testsuites directory to the list of expected ones
This commit is contained in:
parent
5656e2a1b2
commit
167bfca852
1 changed files with 4 additions and 4 deletions
|
@ -299,10 +299,10 @@ class LauncherConfig(Loggable):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if (self.main_dir != DEFAULT_MAIN_DIR or
|
if (self.main_dir != DEFAULT_MAIN_DIR or
|
||||||
self.clone_dir != QA_ASSETS) and \
|
self.clone_dir != QA_ASSETS):
|
||||||
self.testsuites_dirs in DEFAULT_TESTSUITES_DIRS:
|
local_clone_dir = os.path.join(self.main_dir, self.clone_dir, "testsuites")
|
||||||
self.testsuites_dirs.insert(0, os.path.join(self.main_dir, self.clone_dir,
|
if not local_clone_dir in self.testsuites_dirs:
|
||||||
"testsuites"))
|
self.testsuites_dirs.insert(0, local_clone_dir)
|
||||||
if self.valgrind:
|
if self.valgrind:
|
||||||
try:
|
try:
|
||||||
subprocess.check_output("valgrind --help", shell=True)
|
subprocess.check_output("valgrind --help", shell=True)
|
||||||
|
|
Loading…
Reference in a new issue