Browse Source

Try fpm path for testing in sbin as it is default target

pull/2091/merge
Jakub Zelenka 9 years ago
parent
commit
df16579642
  1. 14
      sapi/fpm/tests/include.inc

14
sapi/fpm/tests/include.inc

@ -3,7 +3,6 @@
function get_fpm_path() /* {{{ */
{
$php_path = getenv("TEST_PHP_EXECUTABLE");
for ($i = 0; $i < 2; $i++) {
$slash_pos = strrpos($php_path, "/");
if ($slash_pos) {
@ -13,9 +12,16 @@ function get_fpm_path() /* {{{ */
}
}
if ($php_path && is_dir($php_path) && file_exists($php_path."/fpm/php-fpm") && is_executable($php_path."/fpm/php-fpm")) {
/* gotcha */
return $php_path."/fpm/php-fpm";
if ($php_path && is_dir($php_path)) {
if (file_exists($php_path."/fpm/php-fpm") && is_executable($php_path."/fpm/php-fpm")) {
/* gotcha */
return $php_path."/fpm/php-fpm";
}
$php_sbin_fpm = $php_path."/sbin/php-fpm";
if (file_exists($php_sbin_fpm) && is_executable($php_sbin_fpm)) {
return $php_sbin_fpm;
}
}
return false;
}

Loading…
Cancel
Save