nlopess Mon, 20 Feb 2012 16:01:34 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=323386
Log:
fix race condition in find (it was finding the copied files over and over
again, and recursing forever)
Changed paths:
U php/php-src/branches/PHP_5_3/Makefile.gcov
U php/php-src/branches/PHP_5_4/Makefile.gcov
U php/php-src/trunk/Makefile.gcov
Modified: php/php-src/branches/PHP_5_3/Makefile.gcov
===================================================================
--- php/php-src/branches/PHP_5_3/Makefile.gcov 2012-02-20 15:22:27 UTC (rev
323385)
+++ php/php-src/branches/PHP_5_3/Makefile.gcov 2012-02-20 16:01:34 UTC (rev
323386)
@@ -12,7 +12,8 @@
@rm -rf lcov_data/
@$(mkinstalldirs) lcov_data/
@echo
- -@find . -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 \
+ -@files=`find . -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` ;\
+ for x in $$files; do \
echo -n . ;\
y=`echo $$x | sed -e 's!\.libs/!!'`; \
dir=lcov_data/`dirname $$x`; \
Modified: php/php-src/branches/PHP_5_4/Makefile.gcov
===================================================================
--- php/php-src/branches/PHP_5_4/Makefile.gcov 2012-02-20 15:22:27 UTC (rev
323385)
+++ php/php-src/branches/PHP_5_4/Makefile.gcov 2012-02-20 16:01:34 UTC (rev
323386)
@@ -12,7 +12,8 @@
@rm -rf lcov_data/
@$(mkinstalldirs) lcov_data/
@echo
- -@find . -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 \
+ -@files=`find . -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` ;\
+ for x in $$files; do \
echo -n . ;\
y=`echo $$x | sed -e 's!\.libs/!!'`; \
dir=lcov_data/`dirname $$x`; \
Modified: php/php-src/trunk/Makefile.gcov
===================================================================
--- php/php-src/trunk/Makefile.gcov 2012-02-20 15:22:27 UTC (rev 323385)
+++ php/php-src/trunk/Makefile.gcov 2012-02-20 16:01:34 UTC (rev 323386)
@@ -14,7 +14,8 @@
@rm -rf lcov_data/
@$(mkinstalldirs) lcov_data/
@echo
- -@find . -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' |
$(EGREP) $(LCOV_INCLUDE) | uniq | while read x; do \
+ -@files=`find . -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' | $(EGREP) $(LCOV_INCLUDE) | uniq` ;\
+ for x in $$files; do \
echo -n . ;\
y=`echo $$x | sed -e 's!\.libs/!!'`; \
dir=lcov_data/`dirname $$x`; \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
