Skip to content

Commit 8e97f1e

Browse files
authored
Merge pull request #77 from phalcon/fix/coverage
Minor fixes
2 parents 5fb7e89 + fd64763 commit 8e97f1e

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

.editorconfig

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,17 @@
22

33
# top-most EditorConfig file
44
root = true
5-
charset = utf-8
6-
trim_trailing_whitespace = true
75

86
[*]
97
end_of_line = lf
108
insert_final_newline = true
119
indent_style = tab
1210
indent_size = 4
11+
charset = utf-8
12+
trim_trailing_whitespace = true
1313

14-
[*.{php,phpt,xml,json,w32}]
14+
[*.{yml,m4,sh,md,php,phpt,xml,json,w32}]
1515
indent_style = space
1616

17-
[*.{yml,m4}]
17+
[*.{yml,m4,sh}]
1818
indent_size = 2
19-
indent_style = space
20-
21-
[*.md]
22-
indent_style = space
23-
trim_trailing_whitespace = false

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
*.o
99
*.lo
1010
*.la
11+
*.profraw
12+
1113
.deps
1214
.libs
1315
acinclude.m4

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ install:
6262
--with-php-config=$(phpenv which php-config) \
6363
--enable-zephir-parser \
6464
--enable-zephir-parser-debug \
65-
--enable-coverage \
66-
LDFLAGS="${LDFLAGS} --coverage" \
67-
CFLAGS="${CFLAGS} -O0 -ggdb -fprofile-arcs -ftest-coverage" \
68-
CXXFLAGS="${CXXFLAGS} -O0 -ggdb -fprofile-arcs -ftest-coverage"
65+
--enable-coverage
6966
- make $MAKEJOBS
7067

7168
before_script:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77
## [Unreleased]
88
### Fixed
99
- Fixed underscore only identifiers to allow more than 4 characters
10+
- Update LDFLAGS to reduce linker warnings
1011

1112
## [1.3.1] - 2019-05-01
1213
### Fixed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ Zephir Team
5858

5959
[pr]: https://help.github.com/articles/using-pull-requests/
6060
[forum]: https://forum.zephir-lang.com
61-
[gb]: https://docs.phalconphp.com/en/latest/generating-backtrace
62-
[support]: https://phalconphp.com/support
61+
[gb]: https://docs.phalcon.io/en/latest/generating-backtrace
62+
[support]: https://phalcon.io/support

config.m4

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,16 @@ You can disable ccache by setting environment variable CCACHE_DISABLE=1.
110110
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'`
111111
CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'`
112112
dnl Remove --coverage flag from LDFLAGS
113-
LDFLAGS=`echo "$LDFLAGS" | $SED -e 's/--coverage//g'`
113+
LDFLAGS=`echo "$LDFLAGS" | $SED -e 's/--coverage)//g' -e 's/-fprofile-arcs//g' -e 's/-ftest-coverage//g'`
114114
changequote([,])
115115

116116
dnl Add the special flags
117-
LDFLAGS="$LDFLAGS --coverage"
117+
if test "$($CC --version | head -n 1 | cut -d' ' -f1)" = "Apple"; then
118+
LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage"
119+
else
120+
LDFLAGS="$LDFLAGS -coverage"
121+
fi
122+
118123
CFLAGS="$CFLAGS -O0 -ggdb -fprofile-arcs -ftest-coverage"
119124
CXXFLAGS="$CXXFLAGS -O0 -ggdb -fprofile-arcs -ftest-coverage"
120125

tests/comments/dockblocks/simple.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Example;
1111
/**
1212
* DocBlockFail
1313
*
14-
* @author Paul Scarrone <[email protected]>
14+
* @author Paul Scarrone <[email protected]>
1515
*/
1616
class DocBlockTest {
1717
}
@@ -25,5 +25,5 @@ echo $ir[1]["value"];
2525
**
2626
* DocBlockFail
2727
*
28-
* @author Paul Scarrone <[email protected]>
28+
* @author Paul Scarrone <[email protected]>
2929
*

0 commit comments

Comments
 (0)