Merge branch 'gcovi-json'

Implemented name-binning of gcov input files (fixes use of `new-gcovi`
with GCC 8).

Added support of `gcov --json-format` to `new-gcovi`, which makes the
command usable with GCC 9 and newer.

Author: xaizek

README.md

@@ -1,6 +1,6 @@
 **uncov**, _v0.3_, _2016 – 2021_
 
-_This file last updated on 26 May, 2021_
+_This file last updated on 6 June, 2021_
 
 1. [Description](#description)
 2. [Supported Environment](#supported-environment)
@@ -80,26 +80,28 @@ Expected to work in Unix-like environments.
 
 ## Usage ##
 
-GCC 8 and newer (json format of intermediate data isn't handled by `new-gcovi`):
+Using subcommand (should be faster and less problematic):
+
+    # drop coverage counters from previous run
+    find . -name '*.gcda' -delete
+    # << run tests here >>
+    # collect coverage (--capture-worktree automatically makes stray commit if
+    # worktree is dirty)
+    uncov new-gcovi --exclude tests/ --exclude web/ --capture-worktree
+
+Using a Python script:
 
     # reset coverage counters from previous runs
     find . -name '*.gcda' -delete
-    # < run tests here >
+    # << run tests here >>
     # generage coverage for every object file found (change "." to build root)
     find . -name '*.o' -exec gcov -p {} +
-    # generage and combine coverage reports (--capture-worktree automatically
-    # makes stray commit if worktree is dirty)
+    # collect coverage (--capture-worktree automatically makes stray commit if
+    # worktree is dirty)
     uncov-gcov --root . --no-gcov --capture-worktree --exclude tests | uncov new
     # remove coverage reports
     find . -name '*.gcov' -delete
 
-Earlier versions of GCC:
-
-    # drop coverage counters from previous run
-    find . -name '*.gcda' -delete
-    # < run tests at this point >
-    uncov new-gcovi --exclude tests/ --exclude web/ --capture-worktree
-
 ### Example ###
 
 The easiest way of checking out `uncov` is by using it on itself (assuming that

docs/uncov-gcov.1

@@ -1,11 +1,19 @@
 .\" Automatically generated by Pandoc 1.17.0.3
 .\"
-.TH "uncov-gcov" "1" "June 05, 2021" "uncov v0.3" ""
+.TH "uncov-gcov" "1" "June 06, 2021" "uncov v0.3" ""
 .hy
 .SH NAME
 .PP
 uncov\-gcov is coverage information collector for C and C++ languages
 that can be used with \f[B]uncov(1)\f[].
+.PP
+\f[B]NOTE:\f[] since uncov\-gcov isn\[aq]t the only way to collect C and
+C++ coverage for uncov anymore, its use is discouraged.
+It is provided in case it might work better in some contexts because of
+some unique options (like taking exclusion markers of LCOV into
+account).
+It might be a good idea to switch to using "uncov new\-gcovi"
+subcommand.
 .SH SYNOPSIS
 .PP
 \f[B]uncov\-gcov\f[] \f[B]\-h|\-\-help\f[]

docs/uncov-gcov/01-name.md

@@ -3,3 +3,9 @@ NAME
 
 uncov-gcov is coverage information collector for C and C++ languages that can be
 used with **uncov(1)**.
+
+**NOTE:** since uncov-gcov isn't the only way to collect C and C++ coverage for
+uncov anymore, its use is discouraged.  It is provided in case it might work
+better in some contexts because of some unique options (like taking exclusion
+markers of LCOV into account).  It might be a good idea to switch to using
+"uncov new-gcovi" subcommand.

docs/uncov.1

@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 1.17.0.3
 .\"
-.TH "uncov" "1" "May 26, 2021" "uncov v0.3" ""
+.TH "uncov" "1" "June 05, 2021" "uncov v0.3" ""
 .hy
 .SH NAME
 .PP
@@ -375,9 +375,6 @@ when greater than zero \-\- line is covered and was hit that many times.
 .SS new\-gcovi
 .PP
 Generates coverage via \f[C]gcov\f[] and imports it.
-Doesn\[aq]t understand json version of intermediate format and is thus
-unusable for GCC older than GCC 7 and GCC 8 has a bug which prevents
-this command from working correctly.
 .PP
 \f[B]Usage: new\-gcovi [options...] [covoutroot]\f[]
 .PP

docs/uncov/06-subcommand-list.md

@@ -197,9 +197,7 @@ Integers have the following meaning:
 new-gcovi
 ---------
 
-Generates coverage via `gcov` and imports it.  Doesn't understand json version
-of intermediate format and is thus unusable for GCC older than GCC 7 and GCC 8
-has a bug which prevents this command from working correctly.
+Generates coverage via `gcov` and imports it.
 
 **Usage: new-gcovi [options...] [covoutroot]**