Fix run-tests.php to always include TEST_PHPDBG_EXECUTABLE if phpdbg available

diff --git a/run-tests.php b/run-tests.php
index c6ff35e7ccd159bbfb9b0dea09424bea88249213..fbe6d79d81f2230197ac90f44941f14ac18c1a61 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -159,16 +159,6 @@ if (getenv('TEST_PHP_EXECUTABLE')) {
                                $php_cgi = null;
                        }
                }
-
-               if (!getenv('TEST_PHPDBG_EXECUTABLE')) {
-                       $phpdbg = $cwd . '/sapi/phpdbg/phpdbg';
-
-                       if (file_exists($phpdbg)) {
-                               putenv("TEST_PHPDBG_EXECUTABLE=$phpdbg");
-                       } else {
-                               $phpdbg = null;
-                       }
-               }
        }
        $environment['TEST_PHP_EXECUTABLE'] = $php;
 }
@@ -184,6 +174,23 @@ if (getenv('TEST_PHP_CGI_EXECUTABLE')) {
        $environment['TEST_PHP_CGI_EXECUTABLE'] = $php_cgi;
 }
 
+if (!getenv('TEST_PHPDBG_EXECUTABLE')) {
+       if (!strncasecmp(PHP_OS, "win", 3) && file_exists(dirname($php) . "/phpdbg.exe")) {
+               $phpdbg = realpath(dirname($php) . "/phpdbg.exe");
+       } elseif (file_exists(dirname($php) . "/../../sapi/phpdbg/phpdbg")) {
+               $phpdbg = realpath(dirname($php) . "/../../sapi/phpdbg/phpdbg");
+       } elseif (file_exists("./sapi/phpdbg/phpdbg")) {
+               $phpdbg = realpath("./sapi/phpdbg/phpdbg");
+       } elseif (file_exists(dirname($php) . "/phpdbg")) {
+               $phpdbg = realpath(dirname($php) . "/phpdbg");
+       } else {
+               $phpdbg = null;
+       }
+       if ($phpdbg) {
+               putenv("TEST_PHPDBG_EXECUTABLE=$phpdbg");
+       }
+}
+
 if (getenv('TEST_PHPDBG_EXECUTABLE')) {
        $phpdbg = getenv('TEST_PHPDBG_EXECUTABLE');
 
@@ -1415,26 +1422,12 @@ TEST $file
                if (isset($phpdbg)) {
                        $old_php = $php;
                        $php = $phpdbg . ' -qIb';
-               } else if (!strncasecmp(PHP_OS, "win", 3) && file_exists(dirname($php) . "/phpdbg.exe")) {
-                       $old_php = $php;
-                       $php = realpath(dirname($php) . "/phpdbg.exe") . ' -qIb ';
                } else {
-                       if (file_exists(dirname($php) . "/../../sapi/phpdbg/phpdbg")) {
-                               $old_php = $php;
-                               $php = realpath(dirname($php) . "/../../sapi/phpdbg/phpdbg") . ' -qIb ';
-                       } else if (file_exists("./sapi/phpdbg/phpdbg")) {
-                               $old_php = $php;
-                               $php = realpath("./sapi/phpdbg/phpdbg") . ' -qIb ';
-                       } else if (file_exists(dirname($php) . "/phpdbg")) {
-                               $old_php = $php;
-                               $php = realpath(dirname($php) . "/phpdbg") . ' -qIb ';
-                       } else {
-                               show_result('SKIP', $tested, $tested_file, "reason: phpdbg not available");
+                       show_result('SKIP', $tested, $tested_file, "reason: phpdbg not available");
 
-                               junit_init_suite(junit_get_suitename_for($shortname));
-                               junit_mark_test_as('SKIP', $shortname, $tested, 0, 'phpdbg not available');
-                               return 'SKIPPED';
-                       }
+                       junit_init_suite(junit_get_suitename_for($shortname));
+                       junit_mark_test_as('SKIP', $shortname, $tested, 0, 'phpdbg not available');
+                       return 'SKIPPED';
                }
        }
 

diff --git a/sapi/phpdbg/tests/bug73615.phpt b/sapi/phpdbg/tests/bug73615.phpt
index ade957e50ed8aefcca5daefd3eedd9af30f4d594..e5fccef0a85c3ac50461df51238b848f2749a819 100644 (file)
--- a/sapi/phpdbg/tests/bug73615.phpt
+++ b/sapi/phpdbg/tests/bug73615.phpt
@@ -2,7 +2,7 @@
 Bug #73615 (phpdbg without option never load .phpdbginit at startup)
 --SKIPIF--
 <?php
-if (!getenv('TEST_PHPDBG_EXECUTABLE')) die("No TEST_PHPDBG_EXECUTABLE specified");
+if (!getenv('TEST_PHPDBG_EXECUTABLE')) die("SKIP: No TEST_PHPDBG_EXECUTABLE specified");
 ?>
 --FILE--
 <?php