diff options
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/run-tests.php b/run-tests.php index fef39c50b8..fbe6d79d81 100755 --- 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'; } } @@ -2734,6 +2727,7 @@ function junit_init() { 'test_fail' => 0, 'test_error' => 0, 'test_skip' => 0, + 'test_warn' => 0, 'execution_time'=> 0, 'suites' => array(), 'files' => array() |