aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <aldot@gcc.gnu.org>2012-12-05 08:34:17 +0100
committerBernhard Reutner-Fischer <aldot@gcc.gnu.org>2012-12-05 08:34:17 +0100
commit7fb1e5929d40fd3eb4345d2aed4cd068b3c9eec7 (patch)
tree8ee177b1c32cb11bb01fd5c55af4d9c34a8db915 /contrib
parent3eb9e389a6460b6bd9400a3f4acf88fb2e258e07 (diff)
downloadgcc-7fb1e5929d40fd3eb4345d2aed4cd068b3c9eec7.zip
gcc-7fb1e5929d40fd3eb4345d2aed4cd068b3c9eec7.tar.gz
gcc-7fb1e5929d40fd3eb4345d2aed4cd068b3c9eec7.tar.bz2
validate_failures.py: also ignore .git
2012-12-01 Bernhard Reutner-Fischer <aldot@gcc.gnu.org> * 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. From-SVN: r194182
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog7
-rwxr-xr-xcontrib/testsuite-management/validate_failures.py12
2 files changed, 12 insertions, 7 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index f7fee0e..6bb903c 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-01 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
+
+ * 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.
+
2012-12-03 Diego Novillo <dnovillo@google.com>
* testsuite-management/validate_failures.py: Fix stale
diff --git a/contrib/testsuite-management/validate_failures.py b/contrib/testsuite-management/validate_failures.py
index d02b575..ec51de9 100755
--- a/contrib/testsuite-management/validate_failures.py
+++ b/contrib/testsuite-management/validate_failures.py
@@ -209,11 +209,8 @@ def IsInterestingResult(line):
"""Return True if line is one of the summary lines we care about."""
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 IsInclude(line):
@@ -307,8 +304,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))