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:
Edward Hervey 2017-01-03 07:05:12 +01:00 committed by Edward Hervey
parent 5656e2a1b2
commit 167bfca852

View file

@ -299,10 +299,10 @@ class LauncherConfig(Loggable):
return False
if (self.main_dir != DEFAULT_MAIN_DIR or
self.clone_dir != QA_ASSETS) and \
self.testsuites_dirs in DEFAULT_TESTSUITES_DIRS:
self.testsuites_dirs.insert(0, os.path.join(self.main_dir, self.clone_dir,
"testsuites"))
self.clone_dir != QA_ASSETS):
local_clone_dir = os.path.join(self.main_dir, self.clone_dir, "testsuites")
if not local_clone_dir in self.testsuites_dirs:
self.testsuites_dirs.insert(0, local_clone_dir)
if self.valgrind:
try:
subprocess.check_output("valgrind --help", shell=True)