[PHP-CVS] cvs: php-src / Makefile.gcov

2008-08-03 Thread Marcus Boerger 
helly   Sun Aug  3 18:57:06 2008 UTC

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  - Drop libsqlite even here
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.gcov?r1=1.17r2=1.18diff_format=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.17 php-src/Makefile.gcov:1.18
--- php-src/Makefile.gcov:1.17  Tue Jul 29 08:10:31 2008
+++ php-src/Makefile.gcov   Sun Aug  3 18:57:06 2008
@@ -61,7 +61,7 @@
test -f $$x.bbcp $$x.bb   lcov_data/$$y.bb ; \
test -f $$x.bbg   cp $$x.bbg  lcov_data/$$y.bbg ; \
done
-   for dir in ext/bcmath/libbcmath ext/date/lib ext/fileinfo/libmagic 
ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib 
ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; 
do \
+   for dir in ext/bcmath/libbcmath ext/date/lib ext/fileinfo/libmagic 
ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib 
ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/sqlite3/libsqlite 
ext/xmlrpc/libxmlrpc ext/zip/lib; do \
test -d lcov_data/$$dir  rm -rf lcov_data/$$dir ; \
done
@echo 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.gcov

2008-07-30 Thread Pierre Joye 
hi,

On Wed, Jul 30, 2008 at 2:43 AM, Marcus Boerger [EMAIL PROTECTED] wrote:
 Hello Pierre,

  but we are not creating tests for any of these, actually all of these
 have their own testing system which in most case is not even bundeled or
 executable through PHP. So the only way out is to run their respective test
 systems by bundling them and integrating them into our build and gcov runs.
 However our gcov runs are highly specialized. So I do not see any point in
 doing that. Nor do I see a point in having any of these pull pown or
 percentage and in that way making us look worse then we are and even keep
 us from increasing our limits and goals.

It may be true for pcre or mbstring's libs not for GD for the reasons
I stated earlier.

Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.gcov

2008-07-30 Thread Marcus Boerger 
Hello Pierre,

Wednesday, July 30, 2008, 8:56:41 AM, you wrote:

 hi,

 On Wed, Jul 30, 2008 at 2:43 AM, Marcus Boerger [EMAIL PROTECTED] wrote:
 Hello Pierre,

  but we are not creating tests for any of these, actually all of these
 have their own testing system which in most case is not even bundeled or
 executable through PHP. So the only way out is to run their respective test
 systems by bundling them and integrating them into our build and gcov runs.
 However our gcov runs are highly specialized. So I do not see any point in
 doing that. Nor do I see a point in having any of these pull pown or
 percentage and in that way making us look worse then we are and even keep
 us from increasing our limits and goals.

 It may be true for pcre or mbstring's libs not for GD for the reasons
 I stated earlier.

So you are saying that PHP can use GD in a way that makes it brake which is
not covered by GD's testing? Sounds very bad, actually having GD a PHP
project makes it a really special case. So if you want to and can find a
good way of integrating GD testing than I am happy to address that. Unless
you deliver a solution that goes for our goal which is 90% required for
green in the near future I however have to exclude it.

Best regards,
 Marcus


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.gcov

2008-07-30 Thread Pierre Joye 
Hi,

On Wed, Jul 30, 2008 at 9:18 AM, Marcus Boerger [EMAIL PROTECTED] wrote:

 So you are saying that PHP can use GD in a way that makes it brake which is
 not covered by GD's testing?

That's not what I'm saying. First, GD in php is not the same library
that you have in libgd.org and is better integrated with php (not
possible to do so using an external library). Secondly, almost all
tests available in libgd's tests suite have been ported or are in the
process to be ported to php.


 Sounds very bad, actually having GD a PHP
 project makes it a really special case.

It is irrelevant in this case, they are not the same.

 So if you want to and can find a
 good way of integrating GD testing than I am happy to address that.

It is the case already.

  Unless
 you deliver a solution that goes for our goal which is 90% required for
 green in the near future I however have to exclude it.

As I agree that good coverage is a noble cause. I prefer to have a
slightly lower visible coverage and get the code actually covered
marked as such. Please revert this change for GD.

--
Pierre

http://blog.thepimp.net | http://www.libgd.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.gcov

2008-07-30 Thread Derick Rethans 
On Tue, 29 Jul 2008, Pierre Joye wrote:

 On Tue, Jul 29, 2008 at 10:10 AM, Marcus Boerger [EMAIL PROTECTED] wrote:
  helly   Tue Jul 29 08:10:31 2008 UTC
 
   Modified files:
 /php-srcMakefile.gcov
   Log:
   - Exclude bundled libs from gcov processing
 
 Why? It makes sense to keep it, for example for GD as the lib and php
 are well integrated.

I'd like the same for libmagic (very new, unknown) and timelib (because 
it's well integrated).

regards,
Derick

-- 
HEAD before 5_3!: http://tinyurl.com/6d2esb
http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.gcov

2008-07-30 Thread Marcus Boerger 
Hello Pierre,

Wednesday, July 30, 2008, 9:33:10 AM, you wrote:

 Hi,

 On Wed, Jul 30, 2008 at 9:18 AM, Marcus Boerger [EMAIL PROTECTED] wrote:

 So you are saying that PHP can use GD in a way that makes it brake which is
 not covered by GD's testing?

 That's not what I'm saying. First, GD in php is not the same library
 that you have in libgd.org and is better integrated with php (not
 possible to do so using an external library). Secondly, almost all
 tests available in libgd's tests suite have been ported or are in the
 process to be ported to php.


 Sounds very bad, actually having GD a PHP
 project makes it a really special case.

 It is irrelevant in this case, they are not the same.

 So if you want to and can find a
 good way of integrating GD testing than I am happy to address that.

 It is the case already.

  Unless
 you deliver a solution that goes for our goal which is 90% required for
 green in the near future I however have to exclude it.

 As I agree that good coverage is a noble cause. I prefer to have a
 slightly lower visible coverage and get the code actually covered
 marked as such. Please revert this change for GD.

So it appears that gd is in the exact same situation as ext/dba/libcdb
which I explicitly ported for PHP. Now that one has 82.1% coverage so
obviously has no larger non PHP chunks and also seems to be triggered
in quite enough ways. So I didn't pull it.

My intention was to drop libs that hopefully have there own testing
infrastructure and don't get fully triggered by PHP testing. Best
example is pcre. Where it simply doesn't make sense to write phpt tests
that trigger all those edge cases from PHP. So we rather exclude that
from our calculations as we don't even have the intention to test those.


Best regards,
 Marcus


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.gcov

2008-07-30 Thread Marcus Boerger 
Hello Derick,

Wednesday, July 30, 2008, 9:50:18 AM, you wrote:

 On Tue, 29 Jul 2008, Pierre Joye wrote:

 On Tue, Jul 29, 2008 at 10:10 AM, Marcus Boerger [EMAIL PROTECTED] wrote:
  helly   Tue Jul 29 08:10:31 2008 UTC
 
   Modified files:
 /php-srcMakefile.gcov
   Log:
   - Exclude bundled libs from gcov processing
 
 Why? It makes sense to keep it, for example for GD as the lib and php
 are well integrated.

 I'd like the same for libmagic (very new, unknown) and timelib (because 
 it's well integrated).

timelib, yeah unknown, yeah new, so is it us to write a test system for
them? no!

datelib, cool, great, damn well tested, so no need to test again. Or do you
want all your libdate tests to php?

 regards,
 Derick




Best regards,
 Marcus


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.gcov

2008-07-30 Thread Derick Rethans 
On Wed, 30 Jul 2008, Marcus Boerger wrote:

 Wednesday, July 30, 2008, 9:50:18 AM, you wrote:
 
  On Tue, 29 Jul 2008, Pierre Joye wrote:
 
  On Tue, Jul 29, 2008 at 10:10 AM, Marcus Boerger [EMAIL PROTECTED] wrote:
   helly   Tue Jul 29 08:10:31 2008 UTC
  
Modified files:
  /php-srcMakefile.gcov
Log:
- Exclude bundled libs from gcov processing
  
  Why? It makes sense to keep it, for example for GD as the lib and 
  php are well integrated.
 
  I'd like the same for libmagic (very new, unknown) and timelib 
  (because it's well integrated).
 
 timelib, yeah unknown, yeah new, so is it us to write a test system 
 for them? no!

Uhm yes - we need to support it - libmagic requires most likely a fork. 
And what does it matter if there are a few more libs in here?!

 datelib, cool, great, damn well tested, so no need to test again. Or do you
 want all your libdate tests to php?

Yes, because the behavior in PHP is some times slightly different -- and 
should be.

regards,
Derick

-- 
HEAD before 5_3!: http://tinyurl.com/6d2esb
http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.gcov

2008-07-30 Thread Moriyoshi Koizumi 

On 2008/07/30, at 15:56, Pierre Joye wrote:


hi,

On Wed, Jul 30, 2008 at 2:43 AM, Marcus Boerger [EMAIL PROTECTED] wrote:

Hello Pierre,

 but we are not creating tests for any of these, actually all of  
these
have their own testing system which in most case is not even  
bundeled or
executable through PHP. So the only way out is to run their  
respective test
systems by bundling them and integrating them into our build and  
gcov runs.
However our gcov runs are highly specialized. So I do not see any  
point in

doing that. Nor do I see a point in having any of these pull pown or
percentage and in that way making us look worse then we are and  
even keep

us from increasing our limits and goals.


It may be true for pcre or mbstring's libs not for GD for the reasons
I stated earlier.


I got the same opinion as Marcus's for mbstring and PCRE, while I  
doubt bundling three different regex libraries is a good idea.
The maintainers know better about the treatment of the other bundled  
libraries, I guess.


Moriyoshi



Cheers,
--
Pierre

http://blog.thepimp.net | http://www.libgd.org

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php





--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov

2008-07-29 Thread Marcus Boerger 
helly   Tue Jul 29 08:10:31 2008 UTC

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  - Exclude bundled libs from gcov processing
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.gcov?r1=1.16r2=1.17diff_format=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.16 php-src/Makefile.gcov:1.17
--- php-src/Makefile.gcov:1.16  Thu Jan  4 14:12:14 2007
+++ php-src/Makefile.gcov   Tue Jul 29 08:10:31 2008
@@ -61,6 +61,9 @@
test -f $$x.bbcp $$x.bb   lcov_data/$$y.bb ; \
test -f $$x.bbg   cp $$x.bbg  lcov_data/$$y.bbg ; \
done
+   for dir in ext/bcmath/libbcmath ext/date/lib ext/fileinfo/libmagic 
ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib 
ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; 
do \
+   test -d lcov_data/$$dir  rm -rf lcov_data/$$dir ; \
+   done
@echo 
@echo Generating $@
@$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data 
--output-file $@



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.gcov

2008-07-29 Thread Pierre Joye 
hi,

On Tue, Jul 29, 2008 at 10:10 AM, Marcus Boerger [EMAIL PROTECTED] wrote:
 helly   Tue Jul 29 08:10:31 2008 UTC

  Modified files:
/php-srcMakefile.gcov
  Log:
  - Exclude bundled libs from gcov processing

Why? It makes sense to keep it, for example for GD as the lib and php
are well integrated.

Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.gcov

2008-07-29 Thread Marcus Boerger 
Hello Pierre,

  but we are not creating tests for any of these, actually all of these
have their own testing system which in most case is not even bundeled or
executable through PHP. So the only way out is to run their respective test
systems by bundling them and integrating them into our build and gcov runs.
However our gcov runs are highly specialized. So I do not see any point in
doing that. Nor do I see a point in having any of these pull pown or
percentage and in that way making us look worse then we are and even keep
us from increasing our limits and goals.

marcus

Tuesday, July 29, 2008, 10:17:15 AM, you wrote:

 hi,

 On Tue, Jul 29, 2008 at 10:10 AM, Marcus Boerger [EMAIL PROTECTED] wrote:
 helly   Tue Jul 29 08:10:31 2008 UTC

  Modified files:
/php-srcMakefile.gcov
  Log:
  - Exclude bundled libs from gcov processing

 Why? It makes sense to keep it, for example for GD as the lib and php
 are well integrated.

 Cheers,



Best regards,
 Marcus


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov

2007-01-04 Thread Nuno Lopes 
nlopess Thu Jan  4 14:12:14 2007 UTC

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.gcov?r1=1.15r2=1.16diff_format=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.15 php-src/Makefile.gcov:1.16
--- php-src/Makefile.gcov:1.15  Sun Sep 10 12:38:31 2006
+++ php-src/Makefile.gcov   Thu Jan  4 14:12:14 2007
@@ -67,7 +67,7 @@
 
 lcov-html: php_lcov.info
@echo Generating lcov HTML
-   @$(LTP_GENHTML) --legend --output-directory lcov_html/ --title PHP 
Code Coverage --show-details php_lcov.info
+   @$(LTP_GENHTML) --legend --output-directory lcov_html/ --title PHP 
Code Coverage php_lcov.info
 
 lcov-clean:
rm -f php_lcov.info

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov

2006-09-10 Thread Nuno Lopes 
nlopess Sun Sep 10 12:38:32 2006 UTC

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.gcov?r1=1.14r2=1.15diff_format=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.14 php-src/Makefile.gcov:1.15
--- php-src/Makefile.gcov:1.14  Fri Jun  9 23:46:43 2006
+++ php-src/Makefile.gcov   Sun Sep 10 12:38:31 2006
@@ -29,7 +29,7 @@
@rm -rf lcov_data/
@$(mkinstalldirs) lcov_data/
@echo
-   [EMAIL PROTECTED] . -name \*.gcda -o -name \*.gcno -o -name \*.da | sed 
-e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq | 
while read x; do \
+   [EMAIL PROTECTED] . -name \*.gcda -o -name \*.gcno -o -name \*.da -o 
-name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 
's/\.da//g' | uniq | while read x; do \
echo -n . ;\
y=`echo $$x | sed -e 's!\.libs/!!'`; \
dir=lcov_data/`dirname $$x`; \
@@ -49,6 +49,9 @@
if test -f $(top_srcdir)/$$y.l; then \
ln -f -s $(top_srcdir)/$$y.l lcov_data/$$y.l; \
fi; \
+   if test -f $(top_srcdir)/$$y; then \
+   ln -f -s $(top_srcdir)/$$y lcov_data/$$y; \
+   fi; \
if test -f $(top_builddir)/$$y.c; then \
ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
fi; \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.gcov

2006-06-10 Thread Nuno Lopes 

Thanks Rasmus!
The SoC student was becoming crazy with this problem :)


rasmus Fri Jun  9 23:46:43 2006 UTC

 Modified files:
   /php-src Makefile.gcov
 Log:
 Patch from Nuno


http://cvs.php.net/viewcvs.cgi/php-src/Makefile.gcov?r1=1.13r2=1.14diff_format=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.13 php-src/Makefile.gcov:1.14
--- php-src/Makefile.gcov:1.13 Tue Mar 21 18:17:03 2006
+++ php-src/Makefile.gcov Fri Jun  9 23:46:43 2006
@@ -37,6 +37,9 @@
 if test -f $(top_srcdir)/$$y.c; then \
 ln -f -s $(top_srcdir)/$$y.c lcov_data/$$y.c; \
 fi; \
+ if test -f $(top_srcdir)/$$y.h; then \
+ ln -f -s $(top_srcdir)/$$y.h lcov_data/$$y.h; \
+ fi; \
 if test -f $(top_srcdir)/$$y.re; then \
 ln -f -s $(top_srcdir)/$$y.re lcov_data/$$y.re; \
 fi; \

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov

2006-06-09 Thread Rasmus Lerdorf 
rasmus  Fri Jun  9 23:46:43 2006 UTC

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  Patch from Nuno
  
  
http://cvs.php.net/viewcvs.cgi/php-src/Makefile.gcov?r1=1.13r2=1.14diff_format=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.13 php-src/Makefile.gcov:1.14
--- php-src/Makefile.gcov:1.13  Tue Mar 21 18:17:03 2006
+++ php-src/Makefile.gcov   Fri Jun  9 23:46:43 2006
@@ -37,6 +37,9 @@
if test -f $(top_srcdir)/$$y.c; then \
ln -f -s $(top_srcdir)/$$y.c lcov_data/$$y.c; \
fi; \
+   if test -f $(top_srcdir)/$$y.h; then \
+   ln -f -s $(top_srcdir)/$$y.h lcov_data/$$y.h; \
+   fi; \
if test -f $(top_srcdir)/$$y.re; then \
ln -f -s $(top_srcdir)/$$y.re lcov_data/$$y.re; \
fi; \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov

2006-03-21 Thread Marcus Boerger 
helly   Tue Mar 21 18:17:03 2006 UTC

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  - Drop --no-prefix as disables --prefix which we do for http://gcov.php.net
  # If you need/want this edit your makefile or provide a LTP_GENHTML export
  # of your need when running buildconf
  
  
http://cvs.php.net/viewcvs.cgi/php-src/Makefile.gcov?r1=1.12r2=1.13diff_format=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.12 php-src/Makefile.gcov:1.13
--- php-src/Makefile.gcov:1.12  Wed Mar  8 14:41:45 2006
+++ php-src/Makefile.gcov   Tue Mar 21 18:17:03 2006
@@ -61,7 +61,7 @@
 
 lcov-html: php_lcov.info
@echo Generating lcov HTML
-   @$(LTP_GENHTML) --legend --no-prefix --output-directory lcov_html/ 
--title PHP Code Coverage --show-details php_lcov.info
+   @$(LTP_GENHTML) --legend --output-directory lcov_html/ --title PHP 
Code Coverage --show-details php_lcov.info
 
 lcov-clean:
rm -f php_lcov.info

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov Makefile.global configure.in php.ini-dist php.ini-recommended run-tests.php server-tests.php /ext/standard basic_functions.c basic_functions.h /ext/tidy tidy.c

2006-03-08 Thread Ilia Alshanetsky 
iliaa   Wed Mar  8 14:41:45 2006 UTC

  Modified files:  
/php-srcMakefile.gcov Makefile.global configure.in php.ini-dist 
php.ini-recommended run-tests.php server-tests.php 
/php-src/ext/standard   basic_functions.c basic_functions.h 
/php-src/ext/tidy   tidy.c 
/php-src/ext/zlib   zlib.c 
/php-src/main   SAPI.c config.w32.h fopen_wrappers.c main.c php.h 
php_globals.h php_ini.c 
/php-src/main/streams   plain_wrapper.c 
/php-src/win32  install.txt php5dll.dsp php5dllts.dsp 
/php-src/win32/buildconfig.w32 
  Log:
  So long safe_mode mode.
  Also removed the magic_quotes configure option, no longer relevant since
  the magic is gone :-).
  
  http://cvs.php.net/viewcvs.cgi/php-src/Makefile.gcov?r1=1.11r2=1.12diff_format=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.11 php-src/Makefile.gcov:1.12
--- php-src/Makefile.gcov:1.11  Fri Dec  9 21:40:55 2005
+++ php-src/Makefile.gcov   Wed Mar  8 14:41:45 2006
@@ -13,13 +13,13 @@
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' 
-d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 
'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` 
tests/; \
+   $(PHP_EXECUTABLE) -d 'open_basedir=' -d 
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 
'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` 
tests/; \
elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
NO_INTERACTION=1 \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); 
\
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi
http://cvs.php.net/viewcvs.cgi/php-src/Makefile.global?r1=1.66r2=1.67diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.66 php-src/Makefile.global:1.67
--- php-src/Makefile.global:1.66Fri Dec 23 21:01:05 2005
+++ php-src/Makefile.global Wed Mar  8 14:41:45 2006
@@ -72,12 +72,12 @@
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' 
-d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 
'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` 
tests/; \
+   $(PHP_EXECUTABLE) -d 'open_basedir=' -d 
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 
'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` 
tests/; \
elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php -U $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -U 
$(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi
@@ -87,7 +87,7 @@
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php -u $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -u 
$(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi
@@ -97,7 +97,7 @@
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php -N $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d

Re: [PHP-CVS] cvs: php-src / Makefile.gcov configure.in

2005-12-09 Thread Antony Dovgal 

On 08.12.2005 19:00, Ilia Alshanetsky wrote:

-  ltp_version_list=1.4
+  ltp_version_list=1.5


Once you've made 1.5 as a requirement, it would make sense to add --legend to 
the genhtml command.
I'll commit it if there are no objections.

Index: Makefile.gcov
===
RCS file: /repository/php-src/Makefile.gcov,v
retrieving revision 1.4.2.7
diff -u -p -d -r1.4.2.7 Makefile.gcov
--- Makefile.gcov   8 Dec 2005 16:00:28 -   1.4.2.7
+++ Makefile.gcov   8 Dec 2005 18:31:42 -
@@ -61,7 +61,7 @@ php_lcov.info: lcov-test

lcov-html: php_lcov.info
   @echo Generating lcov HTML
-   @$(LTP_GENHTML) --no-prefix --output-directory lcov_html/ --title PHP Code 
Coverage --show-details php_lcov.info
+   @$(LTP_GENHTML) --no-prefix --output-directory lcov_html/ --title PHP Code 
Coverage --legend --show-details php_lcov.info

lcov-clean:
   rm -f php_lcov.info

--
Wbr, 
Antony Dovgal


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov

2005-12-09 Thread Ilia Alshanetsky 
iliaa   Fri Dec  9 16:40:55 2005 EDT

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  MFB51: Fixed typo in gcov output filename
  
  
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.10r2=1.11ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.10 php-src/Makefile.gcov:1.11
--- php-src/Makefile.gcov:1.10  Thu Dec  8 16:12:31 2005
+++ php-src/Makefile.gcov   Fri Dec  9 16:40:55 2005
@@ -61,7 +61,7 @@
 
 lcov-html: php_lcov.info
@echo Generating lcov HTML
-   @$(LTP_GENHTML) --legend --no-prefix --output-directory lcov_html/ 
--title PHP Code Coverage --show-details php_lcov.infoz
+   @$(LTP_GENHTML) --legend --no-prefix --output-directory lcov_html/ 
--title PHP Code Coverage --show-details php_lcov.info
 
 lcov-clean:
rm -f php_lcov.info

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov configure.in

2005-12-08 Thread Ilia Alshanetsky 
iliaa   Thu Dec  8 11:00:48 2005 EDT

  Modified files:  
/php-srcconfigure.in Makefile.gcov 
  Log:
  MFB51: Final fix for gcov generation.
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.596r2=1.597ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.596 php-src/configure.in:1.597
--- php-src/configure.in:1.596  Wed Nov 30 10:01:22 2005
+++ php-src/configure.inThu Dec  8 11:00:47 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.596 2005/11/30 15:01:22 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.597 2005/12/08 16:00:47 iliaa Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -617,7 +617,7 @@
 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)
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.8r2=1.9ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.8 php-src/Makefile.gcov:1.9
--- php-src/Makefile.gcov:1.8   Sun Dec  4 23:22:37 2005
+++ php-src/Makefile.gcov   Thu Dec  8 11:00:47 2005
@@ -57,7 +57,7 @@
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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov

2005-12-08 Thread Ilia Alshanetsky 
iliaa   Thu Dec  8 16:12:31 2005 EDT

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  MFB51: Include a legend in the gcov report
  
  
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.9r2=1.10ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.9 php-src/Makefile.gcov:1.10
--- php-src/Makefile.gcov:1.9   Thu Dec  8 11:00:47 2005
+++ php-src/Makefile.gcov   Thu Dec  8 16:12:31 2005
@@ -61,7 +61,7 @@
 
 lcov-html: php_lcov.info
@echo Generating lcov HTML
-   @$(LTP_GENHTML) --no-prefix --output-directory lcov_html/ --title PHP 
Code Coverage --show-details php_lcov.info
+   @$(LTP_GENHTML) --legend --no-prefix --output-directory lcov_html/ 
--title PHP Code Coverage --show-details php_lcov.infoz
 
 lcov-clean:
rm -f php_lcov.info

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov

2005-12-04 Thread Ilia Alshanetsky 
iliaa   Sun Dec  4 12:28:26 2005 EDT

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  MFB51: Fixed gcov for generated files
  
  
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.6r2=1.7ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.6 php-src/Makefile.gcov:1.7
--- php-src/Makefile.gcov:1.6   Wed Nov 30 17:27:32 2005
+++ php-src/Makefile.gcov   Sun Dec  4 12:28:26 2005
@@ -31,22 +31,23 @@
@echo
[EMAIL PROTECTED] . -name \*.gcda -o -name \*.gcno -o -name \*.da | sed 
-e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq | 
while read x; do \
echo -n . ;\
+   y=`echo $$x | sed -e 's!\.libs/!!'`; \
dir=lcov_data/`dirname $$x`; \
test -d $$dir || $(mkinstalldirs) $$dir; \
-   if test -f $(top_srcdir)/$$x.c; then \
-   ln -f -s $(top_srcdir)/$$x.c lcov_data/$$x.c; \
+   if test -f $(top_srcdir)/$$y.c; then \
+   ln -f -s $(top_srcdir)/$$y.c lcov_data/$$y.c; \
fi; \
-   if test -f $(top_srcdir)/$$x.re; then \
-   ln -f -s $(top_srcdir)/$$x.re lcov_data/$$x.re; \
+   if test -f $(top_srcdir)/$$y.re; then \
+   ln -f -s $(top_srcdir)/$$y.re lcov_data/$$y.re; \
fi; \
-   if test -f $(top_srcdir)/$$x.y; then \
-   ln -f -s $(top_srcdir)/$$x.y lcov_data/$$x.y; \
+   if test -f $(top_srcdir)/$$y.y; then \
+   ln -f -s $(top_srcdir)/$$y.y lcov_data/$$y.y; \
fi; \
-   if test -f $(top_srcdir)/$$x.l; then \
-   ln -f -s $(top_srcdir)/$$x.l lcov_data/$$x.l; \
+   if test -f $(top_srcdir)/$$y.l; then \
+   ln -f -s $(top_srcdir)/$$y.l lcov_data/$$y.l; \
fi; \
-   if test -f $(top_builddir)/$$x.c; then \
-   ln -f -s $(top_builddir)/$$x.c lcov_data/$$x.c; \
+   if test -f $(top_builddir)/$$y.c; then \
+   ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
fi; \
test -f $$x.gcno  cp $$x.gcno lcov_data/ ; \
test -f $$x.gcda  cp $$x.gcda lcov_data/ ; \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov

2005-12-04 Thread Ilia Alshanetsky 
iliaa   Sun Dec  4 23:22:37 2005 EDT

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  MFB51:Avoid gcov conflicts on non-unique filenames 
  
  
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.7r2=1.8ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.7 php-src/Makefile.gcov:1.8
--- php-src/Makefile.gcov:1.7   Sun Dec  4 12:28:26 2005
+++ php-src/Makefile.gcov   Sun Dec  4 23:22:37 2005
@@ -49,11 +49,11 @@
if test -f $(top_builddir)/$$y.c; then \
ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
fi; \
-   test -f $$x.gcno  cp $$x.gcno lcov_data/ ; \
-   test -f $$x.gcda  cp $$x.gcda lcov_data/ ; \
-   test -f $$x.dacp $$x.da   lcov_data/ ; \
-   test -f $$x.bbcp $$x.bb   lcov_data/ ; \
-   test -f $$x.bbg   cp $$x.bbg  lcov_data/ ; \
+   test -f $$x.gcno  cp $$x.gcno lcov_data/$$y.gcno ; \
+   test -f $$x.gcda  cp $$x.gcda lcov_data/$$y.gcda ; \
+   test -f $$x.dacp $$x.da   lcov_data/$$y.da ; \
+   test -f $$x.bbcp $$x.bb   lcov_data/$$y.bb ; \
+   test -f $$x.bbg   cp $$x.bbg  lcov_data/$$y.bbg ; \
done
@echo 
@echo Generating $@

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov configure.in

2005-11-30 Thread Jani Taskinen 
sniper  Wed Nov 30 10:01:23 2005 EDT

  Modified files:  
/php-srcconfigure.in Makefile.gcov 
  Log:
  - Fix the ccache detection
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.595r2=1.596ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.595 php-src/configure.in:1.596
--- php-src/configure.in:1.595  Tue Nov 29 17:38:32 2005
+++ php-src/configure.inWed Nov 30 10:01:22 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.595 2005/11/29 22:38:32 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.596 2005/11/30 15:01:22 sniper Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -608,14 +608,13 @@
   fi
   
   dnl Check if ccache is being used
-  dnl FIXME: Need a check for ccache usage, the one below does not work!
-  PHP_CHECK_GCC_ARG([--ccache-skip], [gcc_ccache=yes])
-  
-  if test $gcc_ccache = yes; then
-if test -z $CCACHE_DISABLE || test $CCACHE_DISABLE != 1; 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
-lcov_target=lcov-ccache
+  case `$php_shtool path $CC` in
+*ccache*[)] gcc_ccache=yes;;
+*[)] gcc_ccache=no;;
+  esac
+
+  if test $gcc_ccache = yes  (test -z $CCACHE_DISABLE || test 
$CCACHE_DISABLE != 1); 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
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.4r2=1.5ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.4 php-src/Makefile.gcov:1.5
--- php-src/Makefile.gcov:1.4   Wed Nov  9 14:55:25 2005
+++ php-src/Makefile.gcov   Wed Nov 30 10:01:22 2005
@@ -5,12 +5,6 @@
 
 lcov: lcov-html
 
-lcov-ccache:
-   @if test -z $(CCACHE_DISABLE) || test $(CCACHE_DISABLE) != 1; 
then \
-   echo ccache is not disabled. Set environment variable 
CCACHE_DISABLE=1 to disable ccache.; \
-   exit 123; \
-   fi
-
 lcov-test: all
@echo Running test suite
@find . -name \*.gcda | xargs rm -f

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov

2005-11-30 Thread Marcus Boerger 
helly   Wed Nov 30 17:27:33 2005 EDT

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  - Make gcov targets work with debian (http://gcov.php.net)
  
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.5r2=1.6ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.5 php-src/Makefile.gcov:1.6
--- php-src/Makefile.gcov:1.5   Wed Nov 30 10:01:22 2005
+++ php-src/Makefile.gcov   Wed Nov 30 17:27:32 2005
@@ -7,7 +7,7 @@
 
 lcov-test: all
@echo Running test suite
-   @find . -name \*.gcda | xargs rm -f
+   @find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
[EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE)  test -x 
$(PHP_EXECUTABLE); then \
NO_INTERACTION=1 \
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
@@ -29,7 +29,7 @@
@rm -rf lcov_data/
@$(mkinstalldirs) lcov_data/
@echo
-   [EMAIL PROTECTED] . -name \*.gcda -o -name \*.gcno | sed -e 's/^\.\///' 
| sed -e 's/\.gcda//g' -e 's/\.gcno//g' | uniq | while read x; do \
+   [EMAIL PROTECTED] . -name \*.gcda -o -name \*.gcno -o -name \*.da | sed 
-e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq | 
while read x; do \
echo -n . ;\
dir=lcov_data/`dirname $$x`; \
test -d $$dir || $(mkinstalldirs) $$dir; \
@@ -39,11 +39,20 @@
if test -f $(top_srcdir)/$$x.re; then \
ln -f -s $(top_srcdir)/$$x.re lcov_data/$$x.re; \
fi; \
+   if test -f $(top_srcdir)/$$x.y; then \
+   ln -f -s $(top_srcdir)/$$x.y lcov_data/$$x.y; \
+   fi; \
+   if test -f $(top_srcdir)/$$x.l; then \
+   ln -f -s $(top_srcdir)/$$x.l lcov_data/$$x.l; \
+   fi; \
if test -f $(top_builddir)/$$x.c; then \
ln -f -s $(top_builddir)/$$x.c lcov_data/$$x.c; \
fi; \
test -f $$x.gcno  cp $$x.gcno lcov_data/ ; \
test -f $$x.gcda  cp $$x.gcda lcov_data/ ; \
+   test -f $$x.dacp $$x.da   lcov_data/ ; \
+   test -f $$x.bbcp $$x.bb   lcov_data/ ; \
+   test -f $$x.bbg   cp $$x.bbg  lcov_data/ ; \
done
@echo 
@echo Generating $@

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov configure.in

2005-11-09 Thread Jani Taskinen 
sniper  Wed Nov  9 14:55:28 2005 EDT

  Modified files:  
/php-srcMakefile.gcov configure.in 
  Log:
  - Fix the ccache detection.
  
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.3r2=1.4ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.3 php-src/Makefile.gcov:1.4
--- php-src/Makefile.gcov:1.3   Tue Nov  8 15:27:08 2005
+++ php-src/Makefile.gcov   Wed Nov  9 14:55:25 2005
@@ -5,6 +5,12 @@
 
 lcov: lcov-html
 
+lcov-ccache:
+   @if test -z $(CCACHE_DISABLE) || test $(CCACHE_DISABLE) != 1; 
then \
+   echo ccache is not disabled. Set environment variable 
CCACHE_DISABLE=1 to disable ccache.; \
+   exit 123; \
+   fi
+
 lcov-test: all
@echo Running test suite
@find . -name \*.gcda | xargs rm -f
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.590r2=1.591ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.590 php-src/configure.in:1.591
--- php-src/configure.in:1.590  Sun Nov  6 17:44:05 2005
+++ php-src/configure.inWed Nov  9 14:55:25 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.590 2005/11/06 22:44:05 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.591 2005/11/09 19:55:25 sniper Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -604,12 +604,19 @@
 if test $PHP_GCOV = yes; then
 
   if test $GCC != yes; then
-AC_MSG_ERROR([GCC is required to be able use --enable-gcov])
+AC_MSG_ERROR([GCC is required for --enable-gcov])
+  fi
+  
+  dnl Check if ccache is being used
+  PHP_CHECK_GCC_ARG([--ccache-skip], [gcc_ccache=yes])
+  
+  if test $gcc_ccache = yes; then
+if test -z $CCACHE_DISABLE || test $CCACHE_DISABLE != 1; 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
+lcov_target=lcov-ccache
   fi
   
-  dnl Check if we can pass GCC the --ccache-disable option
-  PHP_CHECK_GCC_ARG([--ccache-disable], [CC=$CC --ccache-disable])
-
   ltp_version_list=1.4
 
   AC_CHECK_PROG(LTP, lcov, lcov)
@@ -1232,7 +1239,7 @@
 INLINE_CFLAGS=$INLINE_CFLAGS $standard_libtool_flag
 CXXFLAGS=$CXXFLAGS $standard_libtool_flag
 
-all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
+all_targets=$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) 
\$(PHP_CLI_TARGET)
 install_targets=$install_modules install-build install-headers 
install-programs
 
 case $PHP_SAPI in

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov gen_php_cov

2005-11-08 Thread Jani Taskinen 
sniper  Tue Nov  8 15:27:11 2005 EDT

  Removed files:   
/php-srcgen_php_cov 

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  - Moved gen_php_cov functionality into the Makefile. Doing 'make lcov'
will run the test suite and create the code coverage HTML files.
  # no need for some hairy checks whether PHP has the support 
  # since the lcov target will not exist if it doesn't :)
  
  
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.2r2=1.3ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.2 php-src/Makefile.gcov:1.3
--- php-src/Makefile.gcov:1.2   Tue Nov  8 11:43:09 2005
+++ php-src/Makefile.gcov   Tue Nov  8 15:27:08 2005
@@ -3,9 +3,28 @@
 # LCOV
 #
 
-lcov: php_lcov.info 
+lcov: lcov-html
 
-php_lcov.info: 
+lcov-test: all
+   @echo Running test suite
+   @find . -name \*.gcda | xargs rm -f
+   [EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE)  test -x 
$(PHP_EXECUTABLE); then \
+   NO_INTERACTION=1 \
+   TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
+   TEST_PHP_SRCDIR=$(top_srcdir) \
+   CC=$(CC) \
+   $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' 
-d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 
'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` 
tests/; \
+   elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
+   NO_INTERACTION=1 \
+   TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+   TEST_PHP_SRCDIR=$(top_srcdir) \
+   CC=$(CC) \
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php $(TESTS); \
+   else \
+   echo ERROR: Cannot run tests without CLI sapi.; \
+   fi
+
+php_lcov.info: lcov-test
@echo Generating data for $@
@rm -rf lcov_data/
@$(mkinstalldirs) lcov_data/

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.gcov NEWS configure.in gen_php_cov

2005-10-19 Thread John Coggeshall 
johnWed Oct 19 20:18:26 2005 EDT

  Added files: 
/php-srcMakefile.gcov gen_php_cov 

  Modified files:  
/php-srcNEWS configure.in 
  Log:
  Implementing C-level Code coverage (--enable-gcov).
   
o Requires LTP 1.4+ and libgcov
  
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2070r2=1.2071ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2070 php-src/NEWS:1.2071
--- php-src/NEWS:1.2070 Sat Oct 15 08:54:18 2005
+++ php-src/NEWSWed Oct 19 20:18:23 2005
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? ??? , PHP 6.0
+- C-level Code Coverage Instrumenting (John)
 - Unicode support. (Andrei, Dmitriy, et al)
 - Changed type hints so that they take = NULL as default value. (Marcus,
   Derick)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.588r2=1.589ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.588 php-src/configure.in:1.589
--- php-src/configure.in:1.588  Tue Sep 13 17:40:33 2005
+++ php-src/configure.inWed Oct 19 20:18:23 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.588 2005/09/13 21:40:33 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.589 2005/10/20 00:18:23 john Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -597,6 +597,57 @@
 PHP_CONFIGURE_PART(General settings)
 
 PHP_HELP_SEPARATOR([General settings:])
+PHP_ARG_ENABLE(gcov,  whether to include gcov symbols,
+[  --enable-gcov   Enable GCOV code coverage (requires LTP)], no, no)
+
+if test $PHP_GCOV = yes; then
+  AC_DEFUN([PHP_PROG_LTP],[
+
+ltp_version_list=1.4
+
+AC_CHECK_PROG(LTP, lcov, lcov)
+AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
+if test $LTP; then
+  AC_CACHE_CHECK([for ltp version], php_cv_ltp_version, [
+php_cv_ltp_version=invalid
+ltp_version=`$LTP -v 2/dev/null | $SED -e 's/^.* //'`
+for ltp_check_version in $ltp_version_list; do
+  if test $ltp_version = $ltp_check_version; then
+php_cv_ltp_version=$ltp_check_version (ok)
+  fi
+done
+  ])
+else
+  ltp_msg=To enable code coverage reporting you must have one of the 
following LTP versions installed: $ltp_version_list  
+  AC_MSG_ERROR([$ltp_msg])
+fi
+
+case $php_cv_ltp_version in
+  |invalid[)]
+ltp_msg=You must have one of the following versions of LTP: 
$ltp_version_list (found: $ltp_version).
+AC_MSG_ERROR([$ltp_msg])
+LTP=exit 0;
+;;
+esac
+
+if test $LTP_GENHTML = ; then
+   AC_MSG_ERROR([Could not find genhtml from the LTP package])
+fi
+
+PHP_SUBST(LTP)
+PHP_SUBST(LTP_GENHTML)
+  ])
+
+  PHP_PROG_LTP
+  AC_CHECK_LIB(gcov, __gcov_open, [
+PHP_ADD_LIBRARY(gcov)
+AC_DEFINE(HAVE_GCOV, 1, [Whether you have gcov])
+CFLAGS=$CFLAGS -O0 -fprofile-arcs -ftest-coverage
+PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov,$abs_srcdir)
+  ], [
+AC_MSG_ERROR([Problem with enabling gcov. Please check config.log for 
details.])
+  ])
+fi
 
 PHP_ARG_ENABLE(debug, whether to include debugging symbols,
 [  --enable-debug  Compile with debugging symbols], no, no)

http://cvs.php.net/co.php/php-src/Makefile.gcov?r=1.1p=1
Index: php-src/Makefile.gcov
+++ php-src/Makefile.gcov
.php_cov_info.ltpdata:
@mkdir -p .cov/; \
find . -name \*.gcda -o -name \*.gcno | sed -e 's/^\.\/\.cov\/.*//' | 
xargs --replace cp {} .cov/; \
find . -name \*.gcda -o -name \*.gcno | sed -e 's/^\.\/\.cov\/.*//' | 
sed -e 's/^\.\///' | xargs --max-args=1 dirname | sed -e 's/\/.*//' | xargs 
--replace ln -s `pwd`/{} `pwd`/.cov  /dev/null 21; \
$(LTP) --directory .cov --output-file=.php_cov_info.ltpdata --capture; \

cov: .php_cov_info.ltpdata

cov-html: cov 
@$(LTP_GENHTML) -o cov_html/ .php_cov_info.ltpdata -t PHP Code 
Coverage -s;

cov-clean:
find . -name \*.gcda -o -name \*.gcno -exec rm -f {} \;
rm -f .cov/*  # This is done first, since we are symlinked inside..
rm -Rf .cov   # Now remove the directory
rm -f .php_cov_info.ltpdata
rm -Rf cov_html

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php