fix make test for an external build dir setup

diff --git a/Makefile.global b/Makefile.global
index c684bfe914bc8c7b5eb72a7cbd44ea8db322fc02..29e9a551ad3665b8abd6ed332b4394fcd31df003 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -48,6 +48,7 @@ install-su: install-pear install-tester
 
 test: $(SAPI_CLI_PATH)
        @TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+        TEST_PHP_SRCDIR=$(top_srcdir) \
                        $(top_builddir)/$(SAPI_CLI_PATH) $(top_srcdir)/run-tests.php $(TESTS)
 
 clean:

diff --git a/run-tests.php b/run-tests.php
index 25dbea7b3522ba36b23d9fe897e43c7982e2a94d..1483ae86043525b1de2994adcc9c1a707f043a14 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -36,6 +36,12 @@
  * - do not test PEAR components if base class and/or component class cannot be instanciated
  */
 
+// change into the PHP source directory.
+
+if (getenv('TEST_PHP_SRCDIR')) {
+       @chdir(getenv('TEST_PHP_SRCDIR'));
+}
+
 $cwd = getcwd();
 set_time_limit(0);
 ob_implicit_flush();