From patchwork Tue Dec 4 09:24:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: validate_failures.py: also ignore .git From: Bernhard Reutner-Fischer X-Patchwork-Id: 203585 Message-Id: <1354613050-30655-1-git-send-email-rep.dot.nop@gmail.com> To: Diego Novillo Cc: Bernhard Reutner-Fischer , gcc-patches@gcc.gnu.org Date: Tue, 4 Dec 2012 10:24:10 +0100 contrib/ChangeLog: 2012-12-01 Bernhard Reutner-Fischer * testsuite-management/validate_failures.py (IsInterestingResult): Only strip line a second time if we did split. Rephrase return statement while at it. (CollectSumFiles): Also ignore .git directory. Signed-off-by: Bernhard Reutner-Fischer --- contrib/testsuite-management/validate_failures.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/contrib/testsuite-management/validate_failures.py b/contrib/testsuite-management/validate_failures.py index 7844cb0..280fd23 100755 --- a/contrib/testsuite-management/validate_failures.py +++ b/contrib/testsuite-management/validate_failures.py @@ -194,11 +194,8 @@ def IsInterestingResult(line): return False if '|' in line: (_, line) = line.split('|', 1) - line = line.strip() - for result in _VALID_TEST_RESULTS: - if line.startswith(result): - return True - return False + line = line.strip() + return any(line.startswith(result) for result in _VALID_TEST_RESULTS) def ParseSummary(sum_fname): @@ -240,8 +237,9 @@ def GetManifest(manifest_path): def CollectSumFiles(builddir): sum_files = [] for root, dirs, files in os.walk(builddir): - if '.svn' in dirs: - dirs.remove('.svn') + for ignored in ('.svn', '.git'): + if ignored in dirs: + dirs.remove(ignored) for fname in files: if fname.endswith('.sum'): sum_files.append(os.path.join(root, fname))