From 167bfca852ddde11bb44b6cf2978cee59d8419cb Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward@centricular.com>
Date: Tue, 3 Jan 2017 07:05:12 +0100
Subject: [PATCH] validate: Ensure non-standard testsuite location is taken
into account
This is a regression that was introduced by 6504b9152cfd2d78ee3d773a0a32eec1900f955c
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
---
validate/launcher/main.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/validate/launcher/main.py b/validate/launcher/main.py
index c0c498a4809..8aa16c9f832 100644
--- a/validate/launcher/main.py
+++ b/validate/launcher/main.py
@@ -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)