From b0b284add2f55633b5a68fbc8c373dd70954b700 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Fri, 3 Mar 2017 19:33:37 +0100 Subject: run-tests.sh: Only use phpdbg when coverage information is gathered For some reason phpdbg crashes for me right now so this is a quick workaround to get the tests to run again. Signed-off-by: Florian Pritz --- run-tests.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/run-tests.sh b/run-tests.sh index a65800fb0..89db85ee9 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -32,11 +32,16 @@ cleanup() { mkdir -p test-coverage-data +php=(php) +if ((COLLECT_COVERAGE)); then + php=(phpdbg -qrr) +fi + # run tests -phpdbg -qrr index.php tools drop_all_tables || exit 1 -phpdbg -qrr index.php tools update_database || exit 1 +"${php[@]}" index.php tools drop_all_tables || exit 1 +"${php[@]}" index.php tools update_database || exit 1 -prove --ext .php --state=failed,save --timer --comments --exec 'phpdbg -qrr index.php tools test' --recurse "${@:-application/test/tests/}" || exit 1 +prove --ext .php --state=failed,save --timer --comments --exec "${php[*]} index.php tools test" --recurse "${@:-application/test/tests/}" || exit 1 if (($COLLECT_COVERAGE)); then php index.php tools generate_coverage_report -- cgit v1.2.3-24-g4f1b