* using CGI -C option, you no longer have to specify "full" path to tests

diff --git a/build/rules.mk b/build/rules.mk
index 3a09d411b16ace00c7ffd98a13eb214ab03c4e26..63fab34b21a7d12392741e50fee03bd83b98c5fb 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -55,9 +55,9 @@ distclean: distclean-recursive clean-x
 
 test: $(top_builddir)/php
        @if test "$(TESTS)" = ""; then \
-               TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -d "include_path=.:$(top_srcdir)/pear:$(top_builddir)/pear:$(PEAR_INSTALLDIR)" -q $(top_srcdir)/run-tests.php $(srcdir); \
+               TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -C -q $(top_srcdir)/run-tests.php $(srcdir); \
        else \
-               TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -d include_path=".:$(top_srcdir)/pear:$(top_builddir)/pear:$(PEAR_INSTALLDIR)" -q $(top_srcdir)/run-tests.php $(TESTS); \
+               TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -C -q $(top_srcdir)/run-tests.php $(TESTS); \
        fi
 
 include $(builddir)/.deps

diff --git a/run-tests.php b/run-tests.php
index 5a5af8b3732d5c19b1c97fad0dd2c5be7957b161..cf05f025a4763e3dbadb83e8e49aa6383e671cac 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -127,7 +127,7 @@ function initialize()
         $term_bold = $term_norm = "";
     }
 
-    $windows_p = (substr(php_uname(), 0, 7) == "Windows");
+    $windows_p = (substr(PHP_OS, 0, 3) == "WIN");
     if ($windows_p) {
         if (file_exists('Release_TS_inline\\php.exe')) {
             $php = 'Release_TS_inline\\php.exe';
@@ -137,8 +137,11 @@ function initialize()
             $php=trim($windows_p ? `cd`:`pwd`).'\\php';
         }
     } else {
-        // $php = $GLOBALS["TOP_BUILDDIR"]."/php"; // where should be the origin of this variable
-        $php=trim(`pwd`).'/php';
+        if (isset($GLOBALS["TOP_BUILDDIR"])) {
+            $php = $GLOBALS["TOP_BUILDDIR"]."/php";
+        } else {
+            $php = getcwd() . '/php';
+        }
     }
 
     create_compiled_in_modules_list();