diff options
| -rw-r--r-- | Makefile.global | 2 | ||||
| -rwxr-xr-x | run-tests.php | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.global b/Makefile.global index 0f0b5bf681..855bea5b68 100644 --- a/Makefile.global +++ b/Makefile.global @@ -56,7 +56,7 @@ install-tester: install-su: install-pear install-tester test: sapi/cli/php - TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) \ + @TEST_PHP_EXECUTABLE=$(top_builddir)/sapi/cli/php \ $(top_builddir)/sapi/cli/php -c php.ini-dist $(top_srcdir)/run-tests.php clean: diff --git a/run-tests.php b/run-tests.php index 3b4be11c9d..4241c6764d 100755 --- a/run-tests.php +++ b/run-tests.php @@ -73,7 +73,11 @@ if(!@is_executable($php)) { // Check whether a detailed log is wanted. -define('DETAILED',0 + $_ENV['TEST_PHP_DETAILED']); +if(isset($_ENV['TEST_PHP_DETAILED'])) { + define('DETAILED', $_ENV['TEST_PHP_DETAILED']); +} else { + define('DETAILED', 0); +} // Write test context information. |