On 8/24/17 04:12, Michael Paquier wrote:
> Patch 0001 removes the .gcov files, which offer a text representation
> of the coverage. Sometimes I use that with a terminal... Not sure for
> the others, but that's my status on the matter. This also removes the
> target coverage. Please note that on some distributions, like, err...
> ArchLinux, lcov is not packaged in the core packages and it is
> necessary to make use of external sources (AUR). It would be nice to
> keep the original gcov calls as well, and keep the split between
> coverage-html and coverage. I think as well that html generate should
> be done only if lcov is found, and that text generation should be done
> only if gcov is used. It is annoying to see --enable-coverage fail
> because lcov only is missing, but it is not mandatory for coverage.
OK, I was not aware that people are using it that way. So updated patch
set there, which separates coverage and coverage-html into two
independent targets.
--
Peter Eisentraut http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services
From 39969d232e9d137aadae55f67a45fa2306f43df9 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Thu, 10 Aug 2017 23:33:47 -0400
Subject: [PATCH v3 1/9] Run only top-level recursive lcov
This is the way lcov was intended to be used. It is much faster and
more robust and makes the makefiles simpler than running it in each
subdirectory.
The previous coding ran gcov before lcov, but that is useless because
lcov/geninfo call gcov internally and use that information. Moreover,
this led to complications and failures during parallel make. This
separates the two targets: You either use "make coverage" to get
textual output from gcov or "make coverage-html" to get an HTML report
via lcov. (Using both is still problematic because they write the same
output files.)
---
.gitignore | 1 +
doc/src/sgml/regress.sgml | 13 +++++++++++++
src/Makefile.global.in | 28 ++++++++++++++++------------
3 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4976fd9119..94e2c582f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ objfiles.txt
*.gcov.out
lcov.info
coverage/
+coverage-html-stamp
*.vcproj
*.vcxproj
win32ver.rc
diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
index 7c2b1029c2..14747e5f3b 100644
--- a/doc/src/sgml/regress.sgml
+++ b/doc/src/sgml/regress.sgml
@@ -706,6 +706,19 @@ <title>Test Coverage Examination</title>
The <command>make</command> commands also work in subdirectories.
</para>
+ <para>
+ If you don't have <command>lcov</command> or prefer text output over an
+ HTML report, you can also run
+<screen>
+make coverage
+</screen>
+ instead of <literal>make coverage-html</literal>, which will
+ produce <filename>.gcov</filename> output files for each source file
+ relevant to the test. (<literal>make coverage</literal> and <literal>make
+ coverage-html</literal> will overwrite each other's files, so mixing them
+ might be confusing.)
+ </para>
+
<para>
To reset the execution counts between test runs, run:
<screen>
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index fae8068150..f352ba20e2 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -874,25 +874,29 @@ endif # enable_nls
ifeq ($(enable_coverage), yes)
-# There is a strange interaction between lcov and existing .gcov
-# output files. Hence the rm command and the ordering dependency.
+# make coverage -- text output
-gcda_files := $(wildcard *.gcda)
+local_gcda_files = $(wildcard *.gcda)
-lcov.info: $(gcda_files)
- rm -f *.gcov .*.gcov
- $(if $^,$(LCOV) -d . -c -o $@ $(LCOVFLAGS) --gcov-tool $(GCOV))
+coverage: $(local_gcda_files:.gcda=.c.gcov)
-%.c.gcov: %.gcda | lcov.info
+%.c.gcov: %.gcda
$(GCOV) -b -f -p -o . $(GCOVFLAGS) $*.c >$*.c.gcov.out
-coverage: $(gcda_files:.gcda=.c.gcov) lcov.info
+# make coverage-html -- HTML output via lcov
.PHONY: coverage-html
-coverage-html: coverage
+coverage-html: coverage-html-stamp
+
+coverage-html-stamp: lcov.info
rm -rf coverage
- mkdir coverage
- $(GENHTML) --show-details --legend --output-directory=coverage
--title=PostgreSQL --num-spaces=4 --prefix=$(abs_top_srcdir) `find . -name
lcov.info -print`
+ $(GENHTML) --show-details --legend --output-directory=coverage
--title=PostgreSQL --num-spaces=4 --prefix=$(abs_top_srcdir) $<
+ touch $@
+
+all_gcda_files = $(shell find . -name '*.gcda' -print)
+
+lcov.info: $(all_gcda_files)
+ $(LCOV) -d . -c -o $@ $(LCOVFLAGS) --gcov-tool $(GCOV)
# hook for clean-up
@@ -900,7 +904,7 @@ clean distclean maintainer-clean: clean-coverage
.PHONY: clean-coverage
clean-coverage:
- rm -rf coverage
+ rm -rf coverage coverage-html-stamp
rm -f *.gcda *.gcno lcov.info *.gcov .*.gcov *.gcov.out
base-commit: d42294fc00da4b97d04ddb4401b76295e8d86816
--
2.14.1
From 48c874997f2714268ef2dbdf44d65ebca2a2d5a3 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Thu, 10 Aug 2017 23:33:47 -0400
Subject: [PATCH v3 2/9] Have lcov exclude external files
Call lcov with --no-external option to exclude external files (for
example, system headers with inline functions) from output.
---
src/Makefile.global.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index f352ba20e2..2b22f0de29 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -896,7 +896,7 @@ coverage-html-stamp: lcov.info
all_gcda_files = $(shell find . -name '*.gcda' -print)
lcov.info: $(all_gcda_files)
- $(LCOV) -d . -c -o $@ $(LCOVFLAGS) --gcov-tool $(GCOV)
+ $(LCOV) -d . -c -o $@ $(LCOVFLAGS) --gcov-tool $(GCOV) --no-external
# hook for clean-up
--
2.14.1
From bca43e4dc3f439463a01e3d1458878cd0c45f7ce Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Thu, 10 Aug 2017 23:33:47 -0400
Subject: [PATCH v3 3/9] Add lcov --initial
By just running lcov on the produced .gcda data files, we don't account
for source files that are not touched by tests at all. To fix that, run
lcov --initial to create a base line info file with all zero counters,
and merge that with the actual counters when creating the final report.
---
.gitignore | 2 +-
src/Makefile.global.in | 25 +++++++++++++++++++------
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index 94e2c582f5..a59e3da3be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@ objfiles.txt
*.gcda
*.gcov
*.gcov.out
-lcov.info
+lcov*.info
coverage/
coverage-html-stamp
*.vcproj
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 2b22f0de29..c0a88c9152 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -869,8 +869,13 @@ endif # enable_nls
# gcov from foo.gcda (by "make coverage")
# foo.c.gcov.out stdout captured when foo.c.gcov is created, mildly
# interesting
-# lcov.info lcov tracefile, built from gcda files in one directory,
+# lcov_test.info
+# lcov tracefile, built from gcda files in one directory,
# later collected by "make coverage-html"
+# lcov_base.info
+# tracefile for zero counters for every file, so that
+# even files that are not touched by tests are counted
+# for the overall coverage rate
ifeq ($(enable_coverage), yes)
@@ -888,15 +893,23 @@ coverage: $(local_gcda_files:.gcda=.c.gcov)
.PHONY: coverage-html
coverage-html: coverage-html-stamp
-coverage-html-stamp: lcov.info
+coverage-html-stamp: lcov_base.info lcov_test.info
rm -rf coverage
- $(GENHTML) --show-details --legend --output-directory=coverage
--title=PostgreSQL --num-spaces=4 --prefix=$(abs_top_srcdir) $<
+ $(GENHTML) --show-details --legend --output-directory=coverage
--title=PostgreSQL --num-spaces=4 --prefix=$(abs_top_srcdir) $^
touch $@
+LCOV += --gcov-tool $(GCOV)
+LCOVFLAGS = --no-external
+
+all_gcno_files = $(shell find . -name '*.gcno' -print)
+
+lcov_base.info: $(all_gcno_files)
+ $(LCOV) $(LCOVFLAGS) -c -i -d . -o $@
+
all_gcda_files = $(shell find . -name '*.gcda' -print)
-lcov.info: $(all_gcda_files)
- $(LCOV) -d . -c -o $@ $(LCOVFLAGS) --gcov-tool $(GCOV) --no-external
+lcov_test.info: $(all_gcda_files)
+ $(LCOV) $(LCOVFLAGS) -c -d . -o $@
# hook for clean-up
@@ -905,7 +918,7 @@ clean distclean maintainer-clean: clean-coverage
.PHONY: clean-coverage
clean-coverage:
rm -rf coverage coverage-html-stamp
- rm -f *.gcda *.gcno lcov.info *.gcov .*.gcov *.gcov.out
+ rm -f *.gcda *.gcno lcov*.info *.gcov .*.gcov *.gcov.out
# User-callable target to reset counts between test runs
--
2.14.1
From 28c7d7bebc5c9f57251c05ec0cbffe052061f81a Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Thu, 10 Aug 2017 23:33:47 -0400
Subject: [PATCH v3 4/9] Add PostgreSQL version to coverage output
Also make overriding the title easier. That helps telling where the
report came from and labeling different variants of a report.
---
src/Makefile.global.in | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index c0a88c9152..1a0faf9023 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -893,9 +893,12 @@ coverage: $(local_gcda_files:.gcda=.c.gcov)
.PHONY: coverage-html
coverage-html: coverage-html-stamp
+GENHTML_FLAGS = --show-details --legend
+GENHTML_TITLE = PostgreSQL $(VERSION)
+
coverage-html-stamp: lcov_base.info lcov_test.info
rm -rf coverage
- $(GENHTML) --show-details --legend --output-directory=coverage
--title=PostgreSQL --num-spaces=4 --prefix=$(abs_top_srcdir) $^
+ $(GENHTML) $(GENHTML_FLAGS) -o coverage --title='$(GENHTML_TITLE)'
--num-spaces=4 --prefix='$(abs_top_srcdir)' $^
touch $@
LCOV += --gcov-tool $(GCOV)
--
2.14.1
From b2c42a90be051d69ccd9becb2d60566d29853015 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Thu, 10 Aug 2017 23:33:47 -0400
Subject: [PATCH v3 5/9] Remove coverage details view
This is only useful if we name the different tests, which we don't do at
the moment.
---
src/Makefile.global.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 1a0faf9023..d4fed90405 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -893,7 +893,7 @@ coverage: $(local_gcda_files:.gcda=.c.gcov)
.PHONY: coverage-html
coverage-html: coverage-html-stamp
-GENHTML_FLAGS = --show-details --legend
+GENHTML_FLAGS = --legend
GENHTML_TITLE = PostgreSQL $(VERSION)
coverage-html-stamp: lcov_base.info lcov_test.info
--
2.14.1
From 504d9da1fc72b1e8bab03cc31e7f873f6edaae7a Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Thu, 10 Aug 2017 23:33:47 -0400
Subject: [PATCH v3 6/9] Run coverage commands quietly
They are very chatty by default, but the output doesn't seem all that
useful for normal operation.
---
src/Makefile.global.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index d4fed90405..9340d60de5 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -893,7 +893,7 @@ coverage: $(local_gcda_files:.gcda=.c.gcov)
.PHONY: coverage-html
coverage-html: coverage-html-stamp
-GENHTML_FLAGS = --legend
+GENHTML_FLAGS = -q --legend
GENHTML_TITLE = PostgreSQL $(VERSION)
coverage-html-stamp: lcov_base.info lcov_test.info
@@ -902,7 +902,7 @@ coverage-html-stamp: lcov_base.info lcov_test.info
touch $@
LCOV += --gcov-tool $(GCOV)
-LCOVFLAGS = --no-external
+LCOVFLAGS = -q --no-external
all_gcno_files = $(shell find . -name '*.gcno' -print)
--
2.14.1
From 78d933a2a839216a0ae56b645324200794142854 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Thu, 10 Aug 2017 23:33:47 -0400
Subject: [PATCH v3 7/9] Improve vpath support in plperl build
Run xsubpp with the -output option instead of redirecting stdout. That
ensures that the #line directives in the output file point to the right
place in a vpath build. This in turn fixes an error in coverage builds
that it can't find the source files.
Refactor the makefile rules while we're here.
---
src/pl/plperl/GNUmakefile | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 191f74067a..66a2c3d4c9 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -81,13 +81,9 @@ perlchunks.h: $(PERLCHUNKS)
all: all-lib
-SPI.c: SPI.xs plperl_helpers.h
+%.c: %.xs
@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch
--with-perl was not specified."; exit 1; fi
- $(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap
$(perl_privlibexp)/ExtUtils/typemap $< >$@
-
-Util.c: Util.xs plperl_helpers.h
- @if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch
--with-perl was not specified."; exit 1; fi
- $(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap
$(perl_privlibexp)/ExtUtils/typemap $< >$@
+ $(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap
$(perl_privlibexp)/ExtUtils/typemap -output $@ $<
install: all install-lib install-data
--
2.14.1
From 84ecd03155140a2f75218ccafd08d37da32f5335 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Thu, 10 Aug 2017 23:33:47 -0400
Subject: [PATCH v3 8/9] Support coverage on vpath builds
A few paths needed to be tweaked so everything looks into the
appropriate directories.
---
src/Makefile.global.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 9340d60de5..a4209df7c9 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -898,7 +898,7 @@ GENHTML_TITLE = PostgreSQL $(VERSION)
coverage-html-stamp: lcov_base.info lcov_test.info
rm -rf coverage
- $(GENHTML) $(GENHTML_FLAGS) -o coverage --title='$(GENHTML_TITLE)'
--num-spaces=4 --prefix='$(abs_top_srcdir)' $^
+ $(GENHTML) $(GENHTML_FLAGS) -o coverage --title='$(GENHTML_TITLE)'
--num-spaces=4 $^
touch $@
LCOV += --gcov-tool $(GCOV)
@@ -907,12 +907,12 @@ LCOVFLAGS = -q --no-external
all_gcno_files = $(shell find . -name '*.gcno' -print)
lcov_base.info: $(all_gcno_files)
- $(LCOV) $(LCOVFLAGS) -c -i -d . -o $@
+ $(LCOV) $(LCOVFLAGS) -c -i -d . -d $(srcdir) -o $@
all_gcda_files = $(shell find . -name '*.gcda' -print)
lcov_test.info: $(all_gcda_files)
- $(LCOV) $(LCOVFLAGS) -c -d . -o $@
+ $(LCOV) $(LCOVFLAGS) -c -d . -d $(srcdir) -o $@
# hook for clean-up
--
2.14.1
From fbfdc462ee0f54b716eda3ce88033a792d0f6470 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Thu, 10 Aug 2017 23:33:47 -0400
Subject: [PATCH v3 9/9] Exclude flex-generated code from coverage testing
Flex generates a lot of functions that are not actually used. In order
to avoid coverage figures being ruined by that, mark up the part of the
.l files where the generated code appears by lcov exclusion markers.
That way, lcov will typically only reported on coverage for the .l file,
which is under our control, but not for the .c file.
---
contrib/cube/cubescan.l | 4 ++++
contrib/seg/segscan.l | 4 ++++
src/backend/bootstrap/bootscanner.l | 3 +++
src/backend/parser/scan.l | 5 +++++
src/backend/replication/repl_scanner.l | 3 +++
src/backend/replication/syncrep_scanner.l | 3 +++
src/backend/utils/misc/guc-file.l | 4 +++-
src/bin/pgbench/exprscan.l | 4 ++++
src/bin/psql/psqlscanslash.l | 4 ++++
src/fe_utils/psqlscan.l | 4 ++++
src/interfaces/ecpg/preproc/pgc.l | 6 ++++++
src/test/isolation/specscanner.l | 4 ++++
12 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/contrib/cube/cubescan.l b/contrib/cube/cubescan.l
index dada917820..bd400e3684 100644
--- a/contrib/cube/cubescan.l
+++ b/contrib/cube/cubescan.l
@@ -4,6 +4,8 @@
* contrib/cube/cubescan.l
*/
+/* LCOV_EXCL_START */
+
/* No reason to constrain amount of data slurped */
#define YY_READ_BUF_SIZE 16777216
@@ -56,6 +58,8 @@ NaN [nN][aA][nN]
%%
+/* LCOV_EXCL_STOP */
+
/* result is not used, but Bison expects this signature */
void
yyerror(NDBOX **result, const char *message)
diff --git a/contrib/seg/segscan.l b/contrib/seg/segscan.l
index 6db24fdd1f..5f6595e9eb 100644
--- a/contrib/seg/segscan.l
+++ b/contrib/seg/segscan.l
@@ -3,6 +3,8 @@
* A scanner for EMP-style numeric ranges
*/
+/* LCOV_EXCL_START */
+
/* No reason to constrain amount of data slurped */
#define YY_READ_BUF_SIZE 16777216
@@ -51,6 +53,8 @@ float ({integer}|{real})([eE]{integer})?
%%
+/* LCOV_EXCL_STOP */
+
void
yyerror(SEG *result, const char *message)
{
diff --git a/src/backend/bootstrap/bootscanner.l
b/src/backend/bootstrap/bootscanner.l
index 51c5e5e3cd..5465217bc3 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -38,6 +38,7 @@
/* Not needed now that this file is compiled as part of bootparse. */
/* #include "bootparse.h" */
+/* LCOV_EXCL_START */
/* Avoid exit() on fatal scanner errors (a bit ugly -- see yy_fatal_error) */
#undef fprintf
@@ -134,6 +135,8 @@ insert { return INSERT_TUPLE; }
%%
+/* LCOV_EXCL_STOP */
+
void
yyerror(const char *message)
{
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index 634bfa512f..6af2199cdc 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -41,6 +41,9 @@
}
%{
+
+/* LCOV_EXCL_START */
+
/* Avoid exit() on fatal scanner errors (a bit ugly -- see yy_fatal_error) */
#undef fprintf
#define fprintf(file, fmt, msg) fprintf_to_ereport(fmt, msg)
@@ -1011,6 +1014,8 @@ other .
%%
+/* LCOV_EXCL_STOP */
+
/*
* Arrange access to yyextra for subroutines of the main yylex() function.
* We expect each subroutine to have a yyscanner parameter. Rather than
diff --git a/src/backend/replication/repl_scanner.l
b/src/backend/replication/repl_scanner.l
index 62bb5288c0..568d55ac95 100644
--- a/src/backend/replication/repl_scanner.l
+++ b/src/backend/replication/repl_scanner.l
@@ -38,6 +38,8 @@ static char *litbufdup(void);
static void addlit(char *ytext, int yleng);
static void addlitchar(unsigned char ychar);
+/* LCOV_EXCL_START */
+
%}
%option 8bit
@@ -186,6 +188,7 @@ WAIT { return K_WAIT; }
}
%%
+/* LCOV_EXCL_STOP */
static void
startlit(void)
diff --git a/src/backend/replication/syncrep_scanner.l
b/src/backend/replication/syncrep_scanner.l
index d1d1b26a48..1fbc936aa6 100644
--- a/src/backend/replication/syncrep_scanner.l
+++ b/src/backend/replication/syncrep_scanner.l
@@ -32,6 +32,8 @@ static YY_BUFFER_STATE scanbufhandle;
static StringInfoData xdbuf;
+/* LCOV_EXCL_START */
+
%}
%option 8bit
@@ -112,6 +114,7 @@ xdinside [^"]+
. { return JUNK; }
%%
+/* LCOV_EXCL_STOP */
/* Needs to be here for access to yytext */
void
diff --git a/src/backend/utils/misc/guc-file.l
b/src/backend/utils/misc/guc-file.l
index f01b814c6e..3de8e791f2 100644
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -57,6 +57,8 @@ static void record_config_file_error(const char *errmsg,
static int GUC_flex_fatal(const char *msg);
static char *GUC_scanstr(const char *s);
+/* LCOV_EXCL_START */
+
%}
%option 8bit
@@ -107,7 +109,7 @@ STRING \'([^'\\\n]|\\.|\'\')*\'
%%
-
+/* LCOV_EXCL_STOP */
/*
* Exported function to read and process the configuration file. The
diff --git a/src/bin/pgbench/exprscan.l b/src/bin/pgbench/exprscan.l
index 9bf6d237f5..9f46fb9db8 100644
--- a/src/bin/pgbench/exprscan.l
+++ b/src/bin/pgbench/exprscan.l
@@ -43,6 +43,8 @@ static bool last_was_newline = false;
extern int expr_yyget_column(yyscan_t yyscanner);
extern void expr_yyset_column(int column_no, yyscan_t yyscanner);
+/* LCOV_EXCL_START */
+
%}
/* Except for the prefix, these options should match psqlscan.l */
@@ -190,6 +192,8 @@ continuation \\{newline}
%%
+/* LCOV_EXCL_STOP */
+
void
expr_yyerror_more(yyscan_t yyscanner, const char *message, const char *more)
{
diff --git a/src/bin/psql/psqlscanslash.l b/src/bin/psql/psqlscanslash.l
index db7a1b9eea..080dc37a2f 100644
--- a/src/bin/psql/psqlscanslash.l
+++ b/src/bin/psql/psqlscanslash.l
@@ -67,6 +67,8 @@ static void evaluate_backtick(PsqlScanState state);
extern int slash_yyget_column(yyscan_t yyscanner);
extern void slash_yyset_column(int column_no, yyscan_t yyscanner);
+/* LCOV_EXCL_START */
+
%}
/* Except for the prefix, these options should match psqlscan.l */
@@ -450,6 +452,8 @@ other .
%%
+/* LCOV_EXCL_STOP */
+
/*
* Scan the command name of a psql backslash command. This should be called
* after psql_scan() returns PSCAN_BACKSLASH. It is assumed that the input
diff --git a/src/fe_utils/psqlscan.l b/src/fe_utils/psqlscan.l
index 27689d72da..205756a2fe 100644
--- a/src/fe_utils/psqlscan.l
+++ b/src/fe_utils/psqlscan.l
@@ -71,6 +71,8 @@ typedef int YYSTYPE;
extern int psql_yyget_column(yyscan_t yyscanner);
extern void psql_yyset_column(int column_no, yyscan_t yyscanner);
+/* LCOV_EXCL_START */
+
%}
%option reentrant
@@ -884,6 +886,8 @@ other .
%%
+/* LCOV_EXCL_STOP */
+
/*
* Create a lexer working state struct.
*
diff --git a/src/interfaces/ecpg/preproc/pgc.l
b/src/interfaces/ecpg/preproc/pgc.l
index fc450f30ab..e35843ba4e 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -79,6 +79,8 @@ static struct _if_value
short else_branch;
} stacked_if_value[MAX_NESTED_IF];
+/* LCOV_EXCL_START */
+
%}
%option 8bit
@@ -1249,7 +1251,11 @@ cppline
{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
}
}
<INITIAL>{other}|\n { mmfatal(PARSE_ERROR, "internal error: unreachable
state; please report this to <pgsql-b...@postgresql.org>"); }
+
%%
+
+/* LCOV_EXCL_STOP */
+
void
lex_init(void)
{
diff --git a/src/test/isolation/specscanner.l b/src/test/isolation/specscanner.l
index a9528bda6b..9c0532c0c5 100644
--- a/src/test/isolation/specscanner.l
+++ b/src/test/isolation/specscanner.l
@@ -17,6 +17,8 @@ static int litbufpos = 0;
static void addlitchar(char c);
+/* LCOV_EXCL_START */
+
%}
%option 8bit
@@ -93,6 +95,8 @@ teardown { return TEARDOWN; }
}
%%
+/* LCOV_EXCL_STOP */
+
static void
addlitchar(char c)
{
--
2.14.1
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
