Merge remote-tracking branch 'upstream/master'

1 files changed, 3 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index db5878e..b8236fb 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,7 @@ compile_debug:  ## compile a debug build
         export CFLAGS="-g3 -ggdb -O1 -g"; cd src; ./configure --enable-snuffleupagus --enable-debug
         make -C src
 
-debug: compile_debug ## compile and run a debug build
-        sed -i "s/\$$ext_params -d display_errors=0 -r/-d display_errors=0 -r/" src/run-tests.php
+tests: release  ## compile a release build and run the testsuite
         TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make -C src test
 
 coverage:  ## compile snuffleugpaus, and run the testsuite with coverage
@@ -27,6 +26,7 @@ coverage:  ## compile snuffleugpaus, and run the testsuite with coverage
 ifeq ($(CC),clang)
         cd src; CFLAGS="-fprofile-instr-generate -fcoverage-mapping" ./configure --enable-snuffleupagus
         make -C src
+        sed -i "s/\$$ext_params -d display_errors=0 -r/-d display_errors=0 -r/" src/run-tests.php
         LLVM_PROFILE_FILE="sp_%p_%m.profraw" TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make -C src test
         llvm-profdata-4.0 merge ./src/*.profraw -o ./src/sp.profdata
         llvm-cov report -instr-profile=./src/sp.profdata ./src/modules/snuffleupagus.so
@@ -34,6 +34,7 @@ else
         cd src; ./configure --enable-snuffleupagus --enable-coverage
         make -C src
         rm -Rf src/COV.html
+        sed -i "s/\$$ext_params -d display_errors=0 -r/-d display_errors=0 -r/" src/run-tests.php
         TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make -C src test
         lcov --base-directory ./src --directory ./src -c -o ./src/COV.info --rc lcov_branch_coverage=1 
         lcov --remove src/COV.info '/usr/*' --remove src/COV.info '*tweetnacl.c' -o src/COV.info --rc lcov_branch_coverage=1