Merge pull request #78 from phalcon/fix/coverage

Patch libtool to not remove gcno [skip appveyor]

Author: sergeyklay

.ci/run-tests.sh

@@ -7,33 +7,38 @@
 # For the full copyright and license information, please view
 # the LICENSE file that was distributed with this source code.
 
-export NO_INTERACTION=1
-export REPORT_EXIT_STATUS=1
-export ZEND_DONT_UNLOAD_MODULES=1
-export USE_ZEND_ALLOC=0
+set -e
 
+NO_INTERACTION=1
+REPORT_EXIT_STATUS=1
+ZEND_DONT_UNLOAD_MODULES=1
+USE_ZEND_ALLOC=0
+
+export NO_INTERACTION REPORT_EXIT_STATUS ZEND_DONT_UNLOAD_MODULES USE_ZEND_ALLOC
 if [ -z "${TEST_PHP_EXECUTABLE}" ]; then
-	export TEST_PHP_EXECUTABLE=$(phpenv which php)
+	TEST_PHP_EXECUTABLE="$(phpenv which php)"
+  export TEST_PHP_EXECUTABLE
 fi
 
-PHP_VERNUM="$(`phpenv which php-config` --vernum)"
-PROJECT_ROOT=$(readlink -enq "$(dirname $0)/../")
+PHP_VERNUM="$($(phpenv which php-config) --vernum)"
+PROJECT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." >/dev/null 2>&1 && pwd )"
 
 if [ "${PHP_VERNUM}" -lt 70300 ]; then
-	if [ $(command -v valgrind 2>/dev/null) != "" ]; then
-		export TEST_PHP_ARGS=-m
+	if [ -n "$(command -v valgrind 2>/dev/null)" ]; then
+		TEST_PHP_ARGS=-m
+    export TEST_PHP_ARGS
 	else
 		>&2 echo "Skip check for memory leaks. Valgring does not exist"
 	fi
 else
 	>&2 echo "Skip check for memory leaks due to unstable PHP version"
 fi
 
-${TEST_PHP_EXECUTABLE} ${PROJECT_ROOT}/run-tests.php \
+${TEST_PHP_EXECUTABLE} "${PROJECT_ROOT}/run-tests.php" \
 	-d extension=zephir_parser.so \
-	-d extension_dir=${PROJECT_ROOT}/modules \
+	-d extension_dir="${PROJECT_ROOT}/modules" \
 	-d variables_order=EGPCS \
-	-n ${PROJECT_ROOT}/tests/*.phpt \
+	-n "${PROJECT_ROOT}/tests/*.phpt" \
 	-g "FAIL,XFAIL,BORK,WARN,SKIP" \
 	--offline \
 	--show-diff \

.travis.yml

@@ -32,8 +32,6 @@ env:
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - php: '7.4snapshot'
 
 cache:
   apt: true
@@ -45,18 +43,10 @@ cache:
 before_install:
   - phpenv config-rm xdebug.ini || true
   - ulimit -c unlimited -S || true
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.4" ]]; then export COVERAGE="OFF"; fi
 
 install:
   - .ci/install-re2c.sh
   - phpize
-  - |
-      if [ $COVERAGE = "ON" ]; then
-        aclocal
-        libtoolize --copy --force
-        autoheader
-        autoconf
-      fi
   - |
       ./configure \
         --with-php-config=$(phpenv which php-config) \

parser.mk

@@ -48,6 +48,11 @@ $(srcdir)/parser/parser.c: $(srcdir)/parser/zephir.c $(srcdir)/parser/base.c
 	echo "#line 1 \"$(top_srcdir)/parser/base.c\"" >> $@
 	cat $(top_srcdir)/parser/base.c >> $@
 
-$(srcdir)/parser/zephir.c: $(srcdir)/parser/zephir.lemon $(srcdir)/parser/lemon
+$(srcdir)/parser/zephir.c: $(srcdir)/parser/zephir.lemon $(srcdir)/parser/lemon patch-libtool
 	$(top_srcdir)/parser/lemon $<
 
+# For more see: https://stackoverflow.com/q/49476206
+.PHONY: patch-libtool
+patch-libtool: $(srcdir)/libtool
+	$(AWK) '/case \$$p in/{print;print "\t    *.gcno)\n\t    ;;";next}1' $^ > $^.tmp && mv $^.tmp $^
+	chmod +x $^