mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1'

Browse Source
This commit is contained in:
Bob Weinand 2016-11-30 11:45:36 +01:00
commit c406d1e9b5
2 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
run-tests.php
View File

@ -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';
}
}

2
sapi/phpdbg/tests/bug73615.phpt
View File

@ -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