From 45fb8dff8bc2981151fbca023408c61acbba0f08 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Thu, 15 Sep 2016 08:18:57 +0200 Subject: [PATCH] Squashed commit of the following: commit 788a59093cd72295f7c122f453e693a624038cac Author: Michael Wallner Date: Thu Sep 15 08:18:14 2016 +0200 flush commit e6eb81c90406275f1b27df1ba9ccaa6987980bf8 Author: Michael Wallner Date: Thu Sep 15 07:59:57 2016 +0200 checking if we really need this commit 9cb4ac2e1003aa2aa6465854cb99382b447db2bb Author: Michael Wallner Date: Thu Sep 15 07:44:14 2016 +0200 cd src/.libs commit ec71e1dbf561a6ce1b6b46b027f0e013a8dc2209 Author: Michael Wallner Date: Wed Sep 14 22:43:35 2016 +0200 try to locate gcno files commit 4889271cdaeaf8dc4445523d04b8d95779b13af9 Author: Michael Wallner Date: Wed Sep 14 21:31:25 2016 +0200 anothertry commit 28e3c60b50fa25f459ed6255298483f6210cc317 Author: Michael Wallner Date: Wed Sep 14 19:39:50 2016 +0200 manually run gcov commit 61d159102918e99ac4c674d597fdc12c490850eb Author: Michael Wallner Date: Wed Sep 14 19:12:35 2016 +0200 codecov --- codecov.yml => .codecov.yml | 0 .gitignore | 1 + .travis.yml | 6 +++--- scripts/gen_travis_yml.php | 6 +++--- travis/pecl | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) rename codecov.yml => .codecov.yml (100%) diff --git a/codecov.yml b/.codecov.yml similarity index 100% rename from codecov.yml rename to .codecov.yml diff --git a/.gitignore b/.gitignore index 348538c..4f36007 100644 --- 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 261ec65..78dbc23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ env: - PHP=7.0 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes # 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 @@ -40,10 +40,10 @@ before_script: script: - make -f travis/pecl/Makefile test -after_script: +after_failure: - test -e tests/helper/server.log && cat tests/helper/server.log after_success: - - test -n "$CFLAGS" && bash <(curl -s https://codecov.io/bash) + - test -n "$CFLAGS" && cd src/.libs && bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy sudo: false notifications: diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php index fbfae50..213c5f4 100755 --- a/scripts/gen_travis_yml.php +++ b/scripts/gen_travis_yml.php @@ -30,7 +30,7 @@ foreach ($env as $e) { ?> # 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 @@ -41,10 +41,10 @@ before_script: script: - make -f travis/pecl/Makefile test -after_script: +after_failure: - test -e tests/helper/server.log && cat tests/helper/server.log after_success: - - test -n "$CFLAGS" && bash <(curl -s https://codecov.io/bash) + - test -n "$CFLAGS" && cd src/.libs && bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy sudo: false notifications: diff --git a/travis/pecl b/travis/pecl index 23c2876..2d06b8b 160000 --- a/travis/pecl +++ b/travis/pecl @@ -1 +1 @@ -Subproject commit 23c2876aaa0808bcfedc1c5c30da6e8234341a13 +Subproject commit 2d06b8b6eba14eb26f4e6b5d0eac19569ef1611c -- 2.30.2