anothertry

diff --git a/.gitignore b/.gitignore
index 348538c871f9b28e83aab75ed0d0bc888950a349..4f36007528471f591de8585454a686f444f9000f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -111,3 +111,4 @@ php_http_url.h
 php_http_utf8.h
 php_http_version.h
 >>>>>>> v2.6.x
+*.gcov

diff --git a/.travis.yml b/.travis.yml
index 42049e658b365ad0a1f488f7850610940acbfe4d..cfc947a01422d078e7907192da9f9ebd9486dba2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ addons:
 
 env:
 # once with gcov
- - CFLAGS="-O0 -fprofile-arcs -ftest-coverage" PHP=master enable_json=yes enable_hash=yes enable_iconv=yes 
+ - CFLAGS="-O0 -g --coverage" CXXFLAGS="-O0 -g --coverage" PHP=master enable_json=yes enable_hash=yes enable_iconv=yes 
 
 before_script:
  - make -f travis/pecl/Makefile php
@@ -27,7 +27,7 @@ script:
 after_script:
  - test -e tests/helper/server.log && cat tests/helper/server.log
 after_success:
- - test -n "$CFLAGS" && gcov -pb src/.libs/*.o && bash <(curl -s https://codecov.io/bash) -X gcov -X xcode -X coveragepy
+ - test -n "$CFLAGS" && bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy
 
 sudo: false
 notifications:

diff --git a/travis/pecl b/travis/pecl
index 23c2876aaa0808bcfedc1c5c30da6e8234341a13..2d06b8b6eba14eb26f4e6b5d0eac19569ef1611c 160000 (submodule)
--- a/travis/pecl
+++ b/travis/pecl
@@ -1 +1 @@
-Subproject commit 23c2876aaa0808bcfedc1c5c30da6e8234341a13
+Subproject commit 2d06b8b6eba14eb26f4e6b5d0eac19569ef1611c