Merge pull request #117 from nitnelave/master

Add option to exclude line patterns

Author: myint

README.md

@@ -50,6 +50,8 @@ optional arguments:
                         set include file or directory
   -E REGEXP, --exclude-pattern REGEXP
                         set exclude file/directory pattern
+  --exclude-lines-pattern REGEXP
+                        set exclude lines pattern
   -x EXT, --extension EXT
                         set extension of files to process
   -y FILE, --coveralls-yaml FILE

cpp_coveralls/__init__.py

@@ -84,6 +84,7 @@ def run():
 
     args.exclude.extend(yml.get('exclude', []))
     args.include.extend(yml.get('include', []))
+    args.exclude_lines_pattern.extend(yml.get('exclude_lines_pattern', []))
 
     args.service_job_id = os.environ.get('TRAVIS_JOB_ID', '')
 

cpp_coveralls/coverage.py

@@ -3,6 +3,7 @@
 # Copyright 2015 (c) Lei Xu <eddyxu@gmail.com>
 
 from __future__ import absolute_import
+from builtins import str
 
 import argparse
 import hashlib
@@ -48,6 +49,9 @@ def create_args(params):
     parser.add_argument('-E', '--exclude-pattern', dest='regexp',
                         action='append', metavar='REGEXP', default=[],
                         help='set exclude file/directory pattern')
+    parser.add_argument('--exclude-lines-pattern',
+                        action='append', metavar='REGEXP', default=[],
+                        help='set exclude file/directory pattern')
     parser.add_argument('-x', '--extension', metavar='EXT', action='append',
                         help='set extension of files to process')
     parser.add_argument('-y', '--coveralls-yaml', default='.coveralls.yml',
@@ -236,7 +240,7 @@ def run_gcov(args):
                                       os.path.join(root, files))
 
 
-def parse_gcov_file(fobj, filename):
+def parse_gcov_file(args, fobj, filename):
     """Parses the content of .gcov file
     """
     coverage = []
@@ -271,9 +275,7 @@ def parse_gcov_file(fobj, filename):
             # Avoid false positives.
             if (
                 ignoring or
-                text.lstrip().startswith(('inline', 'static')) or
-                text.strip() == '}' or
-                re.search(r'\bLCOV_EXCL_LINE\b', text)
+                any([re.search(pattern, text) for pattern in args.exclude_lines_pattern])
             ):
                 coverage.append(None)
             else:
@@ -291,21 +293,17 @@ def parse_lcov_file_info(args, filepath, line_iter, line_coverage_re, file_end_s
     """
     coverage = []
     lines_covered = []
-    while True:
-        try:
-            line = line_iter.next()
-            if line != "end_of_record":
-                line_coverage_match = line_coverage_re.match(line)
-                if line_coverage_match:
-                    line_no = line_coverage_match.group(1)
-                    cov_count = int(line_coverage_match.group(2))
-                    if args.max_cov_count:
-                        if cov_count > args.max_cov_count:
-                            cov_count = args.max_cov_count + 1
-                    lines_covered.append((line_no, cov_count))
-            else:
-                break
-        except StopIteration:
+    for line in line_iter:
+        if line != "end_of_record":
+            line_coverage_match = line_coverage_re.match(line)
+            if line_coverage_match:
+                line_no = line_coverage_match.group(1)
+                cov_count = int(line_coverage_match.group(2))
+                if args.max_cov_count:
+                    if cov_count > args.max_cov_count:
+                        cov_count = args.max_cov_count + 1
+                lines_covered.append((line_no, cov_count))
+        else:
             break
 
     num_code_lines = len([line.rstrip('\n') for line in open(filepath, 'r')])
@@ -379,6 +377,12 @@ def collect(args):
     if os.getenv('COVERALLS_PARALLEL', False):
         report['parallel'] = 'true'
 
+    args.exclude_lines_pattern.extend([
+        r'\bLCOV_EXCL_LINE\b',
+        r'^\s*};?\s*$',
+        r'^\s*(inline|static)'
+        ])
+
     discovered_files = set()
     src_files = {}
     abs_root = os.path.abspath(args.root)
@@ -387,27 +391,23 @@ def collect(args):
         line_iter = iter(info_lines)
         new_file_re = re.compile('SF:(.*)')
         line_coverage_re = re.compile('DA:(\d+),(\d+)');
-        while True:
-            try:
-                line = line_iter.next()
-                new_file_match = new_file_re.match(line)
-                if new_file_match:
-                    src_report = {}
-                    filepath = new_file_match.group(1)
-                    if args.build_root:
-                        filepath = os.path.relpath(filepath, args.build_root)
-                    abs_filepath = os.path.join(abs_root, filepath)
-                    src_report['name'] = unicode(posix_path(filepath))
-                    with io.open(abs_filepath, mode='rb') as src_file:
-                        src_report['source_digest'] = hashlib.md5(src_file.read()).hexdigest()
-                    src_report['coverage'] = parse_lcov_file_info(args, abs_filepath, line_iter, line_coverage_re, "end_of_record")
-                    src_files[filepath] = src_report
-                elif line != "TN:":
-                    print('Invalid info file')
-                    print('line: ' + line)
-                    sys.exit(0)
-            except StopIteration:
-                break
+        for line in line_iter:
+            new_file_match = new_file_re.match(line)
+            if new_file_match:
+                src_report = {}
+                filepath = new_file_match.group(1)
+                if args.root:
+                    filepath = os.path.relpath(filepath, args.root)
+                abs_filepath = os.path.join(abs_root, filepath)
+                src_report['name'] = str(posix_path(filepath))
+                with io.open(abs_filepath, mode='rb') as src_file:
+                    src_report['source_digest'] = hashlib.md5(src_file.read()).hexdigest()
+                src_report['coverage'] = parse_lcov_file_info(args, abs_filepath, line_iter, line_coverage_re, "end_of_record")
+                src_files[filepath] = src_report
+            elif line != "TN:":
+                print('Invalid info file')
+                print('line: ' + line)
+                sys.exit(0)
     else:
         for root, dirs, files in os.walk(args.root, followlinks=args.follow_symlinks):
             dirs[:] = filter_dirs(root, dirs, excl_paths)
@@ -447,7 +447,7 @@ def collect(args):
                         with io.open(source_file_path, mode='rb') as src_file:
                             src_report['source_digest'] = hashlib.md5(src_file.read()).hexdigest()
 
-                        src_report['coverage'] = parse_gcov_file(fobj, gcov_path)
+                        src_report['coverage'] = parse_gcov_file(args, fobj, gcov_path)
                         if src_path in src_files:
                             src_files[src_path] = combine_reports(src_files[src_path], src_report)
                         else:

requirements.txt

@@ -1,2 +1,3 @@
 requests
 urllib3[secure]
+future