Merge branch 'PHP-7.1'

2 files changed, 22 insertions, 29 deletions

diff --git a/run-tests.php b/run-tests.php
index 1b97e673c9..678e3b85c2 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -122,16 +122,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;
 }
@@ -147,6 +137,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');
 
@@ -1401,26 +1408,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 ade957e50e..e5fccef0a8 100644
--- 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