From ce7303633c573ae71de9c9222766ec5feff3f581 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 1 Mar 2022 14:06:06 -0800 Subject: [PATCH] Update PHP tests to send warnings/errors to stderr --- test/tests/php-ext-install/container.sh | 4 ++-- test/tests/run-php-in-container.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/tests/php-ext-install/container.sh b/test/tests/php-ext-install/container.sh index c5af333b95..31b28a9b61 100755 --- a/test/tests/php-ext-install/container.sh +++ b/test/tests/php-ext-install/container.sh @@ -2,10 +2,10 @@ set -e docker-php-ext-install pdo_mysql 2>&1 -php -r 'exit(extension_loaded("pdo_mysql") ? 0 : 1);' +php -d display_errors=stderr -r 'exit(extension_loaded("pdo_mysql") ? 0 : 1);' grep -q '^extension=' /usr/local/etc/php/conf.d/*pdo_mysql*.ini # opcache is pre-built by default at least as far back as PHP 5.5 docker-php-ext-enable opcache 2>&1 -php -r 'exit(extension_loaded("Zend OPcache") ? 0 : 1);' +php -d display_errors=stderr -r 'exit(extension_loaded("Zend OPcache") ? 0 : 1);' grep -q '^zend_extension=' /usr/local/etc/php/conf.d/*opcache*.ini diff --git a/test/tests/run-php-in-container.sh b/test/tests/run-php-in-container.sh index 16f0ae1f94..099443b9ce 100755 --- a/test/tests/run-php-in-container.sh +++ b/test/tests/run-php-in-container.sh @@ -4,4 +4,4 @@ set -e testDir="$(readlink -f "$(dirname "$BASH_SOURCE")")" runDir="$(dirname "$(readlink -f "$BASH_SOURCE")")" -source "$runDir/run-in-container.sh" "$testDir" "$1" php ./container.php +source "$runDir/run-in-container.sh" "$testDir" "$1" php -d display_errors=stderr ./container.php