Fix: incorrect path for header can still generate

Fixes gcovr#271
ensky · Mar 17, 2020 · 7f29ad2 · 7f29ad2
1 parent e4dfebe
commit 7f29ad2
Show file tree

Hide file tree

Showing 14 changed files with 1,485 additions and 6 deletions.
diff --git a/gcovr/html_generator.py b/gcovr/html_generator.py
@@ -16,6 +16,7 @@
 from .version import __version__
 from .utils import commonpath, sort_coverage
 from .coverage import FileCoverage
+from .utils import Logger
 
 
 class lazy(object):
@@ -87,6 +88,8 @@ def coverage_to_color(coverage, medium_threshold, high_threshold):
 # Produce an HTML report
 #
 def print_html_report(covdata, output_file, options):
+    logger = Logger(options.verbose)
+
     medium_threshold = options.html_medium_threshold
     high_threshold = options.html_high_threshold
     details = options.html_details
@@ -245,12 +248,14 @@ def print_html_report(covdata, output_file, options):
         data['ROWS'] = []
         currdir = os.getcwd()
         os.chdir(options.root_dir)
-        with io.open(data['FILENAME'], 'r', encoding=options.source_encoding,
-                     errors='replace') as INPUT:
-            for ctr, line in enumerate(INPUT, 1):
-                data['ROWS'].append(
-                    source_row(ctr, line.rstrip(), cdata.lines.get(ctr))
-                )
+        try:
+            with io.open(data['FILENAME'], 'r', encoding=options.source_encoding, errors='replace') as INPUT:
+                for ctr, line in enumerate(INPUT, 1):
+                    data['ROWS'].append(
+                        source_row(ctr, line.rstrip(), cdata.lines.get(ctr))
+                    )
+        except IOError as e:
+            logger.warn('File Generation failed: {filename}, reason={reason}', filename=data['FILENAME'], reason=repr(e))
         os.chdir(currdir)
 
         htmlString = templates().get_template('source_page.html').render(**data)

diff --git a/gcovr/tests/subfolder-includes/Makefile b/gcovr/tests/subfolder-includes/Makefile
@@ -0,0 +1,27 @@
+all:
+	make -C subfolder
+
+run: txt xml html sonarqube json
+
+txt:
+	./subfolder/subfolder/testcase
+	$(GCOVR) -d -o coverage.txt
+
+xml:
+	./subfolder/subfolder/testcase
+	$(GCOVR) -d -x -o coverage.xml
+
+html:
+	./subfolder/subfolder/testcase
+	$(GCOVR) -d --html-details -o coverage.html
+
+sonarqube:
+	./subfolder/subfolder/testcase
+	$(GCOVR) -d --sonarqube sonarqube.xml
+
+json:
+	# pass
+
+clean:
+	make -C subfolder clean
+	rm -f coverage.txt coverage.xml coverage*.html sonarqube.xml
diff --git a/gcovr/tests/subfolder-includes/README b/gcovr/tests/subfolder-includes/README
@@ -0,0 +1 @@
+A subfolder includes pattern that causes include header file has a incorrect relative path in .gcov file.
diff --git a/gcovr/tests/subfolder-includes/include/lib.h b/gcovr/tests/subfolder-includes/include/lib.h
@@ -0,0 +1,4 @@
+int foo();
+inline int bar() {
+	return 1;
+}