Hi.
Simple format extension which prints working directory of TU when it was
compiled.
It's requested by LCOV folks.
Survives make check -k -j10 RUNTESTFLAGS="gcov.exp"
Ready for trunk?
Thanks,
Martin
gcc/ChangeLog:
2018-05-18 Martin Liska <mli...@suse.cz>
PR gcov-profile/84846
* coverage.c (coverage_init): Write PWD to .gcno file.
* doc/gcov.texi: Document how working directory is printed.
* gcov-dump.c (dump_gcov_file): Print PWD.
* gcov.c (output_intermediate_file): Likewise.
(read_graph_file): Read PWD string.
(output_lines): Print PWD.
---
gcc/coverage.c | 1 +
gcc/doc/gcov.texi | 5 +++++
gcc/gcov-dump.c | 2 ++
gcc/gcov.c | 7 +++++++
4 files changed, 15 insertions(+)
diff --git a/gcc/coverage.c b/gcc/coverage.c
index 32ef298a11f..9e0185acd09 100644
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -1269,6 +1269,7 @@ coverage_init (const char *filename)
gcov_write_unsigned (GCOV_NOTE_MAGIC);
gcov_write_unsigned (GCOV_VERSION);
gcov_write_unsigned (bbg_file_stamp);
+ gcov_write_string (getpwd ());
/* Do not support has_unexecuted_blocks for Ada. */
gcov_write_unsigned (strcmp (lang_hooks.name, "GNU Ada") != 0);
diff --git a/gcc/doc/gcov.texi b/gcc/doc/gcov.texi
index 59235876aaa..9d5cdbc8e03 100644
--- a/gcc/doc/gcov.texi
+++ b/gcc/doc/gcov.texi
@@ -189,6 +189,7 @@ one entry per line
@smallexample
version:@var{gcc_version}
+pwd:@var{working_directory}
file:@var{source_file_name}
function:@var{start_line_number},@var{end_line_number},@var{execution_count},@var{function_name}
lcount:@var{line number},@var{execution_count},@var{has_unexecuted_block}
@@ -210,6 +211,7 @@ Here is a sample when @option{-i} is used in conjunction with @option{-b} option
@smallexample
version: 8.1.0 20180103
+pwd:/home/gcc/testcase
file:tmp.cpp
function:7,7,0,_ZN3FooIcEC2Ev
function:7,7,1,_ZN3FooIiEC2Ev
@@ -441,6 +443,7 @@ Here is a sample:
@smallexample
-: 0:Source:tmp.cpp
+ -: 0:Working directory:/home/gcc/testcase
-: 0:Graph:tmp.gcno
-: 0:Data:tmp.gcda
-: 0:Runs:1
@@ -508,6 +511,7 @@ counts, and the output looks like this:
@smallexample
-: 0:Source:tmp.cpp
+ -: 0:Working directory:/home/gcc/testcase
-: 0:Graph:tmp.gcno
-: 0:Data:tmp.gcda
-: 0:Runs:1
@@ -596,6 +600,7 @@ When you use the @option{-b} option, your output looks like this:
@smallexample
-: 0:Source:tmp.cpp
+ -: 0:Working directory:/home/gcc/testcase
-: 0:Graph:tmp.gcno
-: 0:Data:tmp.gcda
-: 0:Runs:1
diff --git a/gcc/gcov-dump.c b/gcc/gcov-dump.c
index ba432db51c7..210e9e46c2e 100644
--- a/gcc/gcov-dump.c
+++ b/gcc/gcov-dump.c
@@ -220,6 +220,8 @@ dump_gcov_file (const char *filename)
if (!is_data_type)
{
+ printf ("%s:pwd: %s\n", filename, gcov_read_string ());
+
/* Support for unexecuted basic blocks. */
unsigned support_unexecuted_blocks = gcov_read_unsigned ();
if (!support_unexecuted_blocks)
diff --git a/gcc/gcov.c b/gcc/gcov.c
index 6bbfe33ca33..92972e29b4d 100644
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -432,6 +432,9 @@ static unsigned bbg_stamp;
/* Supports has_unexecuted_blocks functionality. */
static unsigned bbg_supports_has_unexecuted_blocks;
+/* Working directory in which a TU was compiled. */
+static const char *bbg_pwd;
+
/* Name and file pointer of the input file for the count data (gcda). */
static char *da_file_name;
@@ -1037,6 +1040,7 @@ output_intermediate_file (FILE *gcov_file, source_info *src)
{
fprintf (gcov_file, "version:%s\n", version_string);
fprintf (gcov_file, "file:%s\n", src->name); /* source file name */
+ fprintf (gcov_file, "pwd:%s\n", bbg_pwd);
std::sort (src->functions.begin (), src->functions.end (),
function_line_start_cmp ());
@@ -1550,6 +1554,7 @@ read_graph_file (void)
bbg_file_name, v, e);
}
bbg_stamp = gcov_read_unsigned ();
+ bbg_pwd = xstrdup (gcov_read_string ());
bbg_supports_has_unexecuted_blocks = gcov_read_unsigned ();
function_info *fn = NULL;
@@ -2918,6 +2923,8 @@ output_lines (FILE *gcov_file, const source_info *src)
const char *retval;
fprintf (gcov_file, DEFAULT_LINE_START "Source:%s\n", src->coverage.name);
+ fprintf (gcov_file, DEFAULT_LINE_START "Working directory:%s\n",
+ bbg_pwd);
if (!multiple_files)
{
fprintf (gcov_file, DEFAULT_LINE_START "Graph:%s\n", bbg_file_name);
