Commit5882958

committed

Check for gcov and lcov only when coverage testing is enabled.

1 parent5bc561a commit5882958Copy full SHA for 5882958

File tree

+22

-23

lines changed

+22

-23

lines changed

Lines changed: 18 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -2484,25 +2484,7 @@ if test "${enable_coverage+set}" = set; then`
`2484`	`2484`	`enableval=$enable_coverage;`
`2485`	`2485`	`case $enableval in`
`2486`	`2486`	`yes)`
`2487`		`- :`
`2488`		`- ;;`
`2489`		`- no)`
`2490`		`- :`
`2491`		`- ;;`
`2492`		`- *)`
`2493`		`- { { echo "$as_me:$LINENO: error: no argument expected for --enable-coverage option" >&5`
`2494`		`-echo "$as_me: error: no argument expected for --enable-coverage option" >&2;}`
`2495`		`- { (exit 1); exit 1; }; }`
`2496`		`- ;;`
`2497`		`- esac`
`2498`		`-`
`2499`		`-else`
`2500`		`- enable_coverage=no`
`2501`		`-`
`2502`		`-fi`
`2503`		`-`
`2504`		`-`
`2505`		`-for ac_prog in gcov`
	`2487`	`+ for ac_prog in gcov`
`2506`	`2488`	`do`
`2507`	`2489`	`# Extract the first word of "$ac_prog", so it can be a program name with args.`
`2508`	`2490`	`set dummy $ac_prog; ac_word=$2`
`@@ -2643,6 +2625,23 @@ if test -z "$GENHTML"; then`
`2643`	`2625`	`echo "$as_me: error: genhtml not found" >&2;}`
`2644`	`2626`	`{ (exit 1); exit 1; }; }`
`2645`	`2627`	`fi`
	`2628`	`+ ;;`
	`2629`	`+ no)`
	`2630`	`+ :`
	`2631`	`+ ;;`
	`2632`	`+ *)`
	`2633`	`+ { { echo "$as_me:$LINENO: error: no argument expected for --enable-coverage option" >&5`
	`2634`	`+echo "$as_me: error: no argument expected for --enable-coverage option" >&2;}`
	`2635`	`+ { (exit 1); exit 1; }; }`
	`2636`	`+ ;;`
	`2637`	`+ esac`
	`2638`	`+`
	`2639`	`+else`
	`2640`	`+ enable_coverage=no`
	`2641`	`+`
	`2642`	`+fi`
	`2643`	`+`
	`2644`	`+`
`2646`	`2645`
`2647`	`2646`
`2648`	`2647`	`#`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $PostgreSQL: pgsql/configure.in,v 1.566 2008/09/0512:11:18 petere Exp $`
	`2`	`+dnl $PostgreSQL: pgsql/configure.in,v 1.567 2008/09/0518:54:58 petere Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -207,8 +207,8 @@ AC_SUBST(enable_profiling)`
`207`	`207`	`# --enable-coverage enables generation of code coverage metrics with gcov`
`208`	`208`	`#`
`209`	`209`	`PGAC_ARG_BOOL(enable, coverage, no,`
`210`		`- [ --enable-coverage build with coverage testing instrumentation])`
`211`		`-AC_CHECK_PROGS(GCOV, gcov)`
	`210`	`+ [ --enable-coverage build with coverage testing instrumentation],`
	`211`	`+[AC_CHECK_PROGS(GCOV, gcov)`
`212`	`212`	`if test -z "$GCOV"; then`
`213`	`213`	`AC_MSG_ERROR([gcov not found])`
`214`	`214`	`fi`
`@@ -219,7 +219,7 @@ fi`
`219`	`219`	`AC_CHECK_PROGS(GENHTML, genhtml)`
`220`	`220`	`if test -z "$GENHTML"; then`
`221`	`221`	`AC_MSG_ERROR([genhtml not found])`
`222`		`-fi`
	`222`	`+fi])`
`223`	`223`	`AC_SUBST(enable_coverage)`
`224`	`224`
`225`	`225`	`#`

Comments

(0)