From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 8 Dec 2005 16:00:47 +0000 (+0000)
Subject: MFB51: Final fix for gcov generation.
X-Git-Tag: RELEASE_1_0_4~466
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c8d2091b27e503409acc610abe90d99eab043e2;p=php

MFB51: Final fix for gcov generation.
---

diff --git a/Makefile.gcov b/Makefile.gcov
index d19c8e449e..4276bd85f8 100644
--- a/Makefile.gcov
+++ b/Makefile.gcov
@@ -57,7 +57,7 @@ php_lcov.info: lcov-test
 	done
 	@echo 
 	@echo "Generating $@"
-	@$(LTP) --directory lcov_data/ --capture --output-file $@ --test-name PHP_LCOV
+	@$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@
 
 lcov-html: php_lcov.info
 	@echo "Generating lcov HTML"
diff --git a/configure.in b/configure.in
index aed49e2d17..0a91d729ad 100644
--- a/configure.in
+++ b/configure.in
@@ -617,7 +617,7 @@ if test "$PHP_GCOV" = "yes"; then
     AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
   fi
   
-  ltp_version_list="1.4"
+  ltp_version_list="1.5"
 
   AC_CHECK_PROG(LTP, lcov, lcov)
   AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)