Fix make test and remove a warning

diff --git a/Makefile.global b/Makefile.global
index 0f0b5bf681ed96d3b7f5b627e584617612b05dd8..855bea5b6872123886df35171f6a79c1775bd221 100644 (file)
--- 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 3b4be11c9dcad429db14f0e2f0457eeaf3635568..4241c6764d554eaef9d767fea2719fe904761a69 100755 (executable)
--- 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.