From 94d73bd4113441f84c2dd76c708c6bda569864ad Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 6 Mar 2014 17:55:00 -0800 Subject: [PATCH] suite: fix build_matrix for + case The + means we should concatenate everything in the directory. Do that. This was totally broken before (and unused until now). Signed-off-by: Sage Weil --- teuthology/suite.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/teuthology/suite.py b/teuthology/suite.py index 60d09e7a29..0ff0c50d37 100644 --- a/teuthology/suite.py +++ b/teuthology/suite.py @@ -160,13 +160,14 @@ def build_matrix(path): if '+' in files: # concatenate items files.remove('+') - out = [] + raw = [] for fn in files: - out.extend(build_matrix(os.path.join(path, fn))) - return [( - '+', - [a[1] for a in out] - )] + raw.extend(build_matrix(os.path.join(path, fn))) + out = [( + '{' + ' '.join(files) + '}', + [a[1][0] for a in raw] + )] + return out elif '%' in files: # convolve items files.remove('%') -- 2.39.5