com php-src: Skip session_regenerate_id_cookie.phpt w hen there's no cgi: ext/session/tests/session_reg enerate_id_cookie.phpt
| From: | Matteo Beccati | Date: | Fri, 18 Sep 2015 05:51:46 +0000 |
| Subject: | com php-src: Skip session_regenerate_id_cookie.phpt w hen there's no cgi: ext/session/tests/session_reg enerate_id_cookie.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89064@lists.php.net to get a copy of this message | ||
Commit: cc875d1a25470c72a1bb8ce88388ce7f9e5ce737
Author: Matteo Beccati <mbeccati@php.net> Fri, 18 Sep 2015 07:51:46 +0200
Parents: 5b8981f12eae17aa965f6c14bf99d28ee934f3bc
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cc875d1a25470c72a1bb8ce88388ce7f9e5ce737
Log:
Skip session_regenerate_id_cookie.phpt when there's no cgi
Changed paths:
M ext/session/tests/session_regenerate_id_cookie.phpt
Diff:
diff --git a/ext/session/tests/session_regenerate_id_cookie.phpt
b/ext/session/tests/session_regenerate_id_cookie.phpt
index 80375b6..442e69b 100644
--- a/ext/session/tests/session_regenerate_id_cookie.phpt
+++ b/ext/session/tests/session_regenerate_id_cookie.phpt
@@ -1,7 +1,15 @@
--TEST--
Test session_regenerate_id() function : basic functionality
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+
+include('skipif.inc');
+
+require __DIR__.'/../../../sapi/cgi/tests/include.inc';
+
+get_cgi_path() or die('skip no cgi');
+
+?>
--FILE--
<?php
@@ -13,60 +21,7 @@ Test session_regenerate_id() function : basic functionality
echo "*** Testing session_regenerate_id() : basic functionality for cookie ***\n";
-/* Taken from sapi/cgi/tests/include.inc */
-function get_cgi_path() /* {{{ */
-{
- $php = getenv("TEST_PHP_EXECUTABLE");
-
- $cli = false;
- $cgi = false;
-
- if (file_exists($php) && is_executable($php)) {
- $version =
$php -n -v;
- if (strstr($version, "(cli)")) {
- /* that's cli */
- $cli = true;
- } else if (strpos($version, "(cgi")) {
- /* that's cgi */
- return $php;
- }
- }
-
- if ($cli) {
- /* trying to guess ... */
- $php_path = $php;
- for ($i = 0; $i < 2; $i++) {
- $slash_pos = strrpos($php_path, "/");
- if ($slash_pos) {
- $php_path = substr($php_path, 0, $slash_pos);
- } else {
- return FALSE;
- }
- }
-
- if ($php_path && is_dir($php_path) &&
file_exists($php_path."/cgi/php-cgi") &&
is_executable($php_path."/cgi/php-cgi")) {
- /* gotcha */
- return $php_path."/cgi/php-cgi";
- }
- return false;
- }
- /* uhm? what's that then? */
- return false;
-}
-/* }}} */
-
-function reset_env_vars() /* {{{ */
-{
- putenv("REDIRECT_STATUS");
- putenv("QUERY_STRING");
- putenv("PATH_TRANSLATED");
- putenv("SCRIPT_FILENAME");
- putenv("SERVER_SOFTWARE");
- putenv("SERVER_NAME");
- putenv("GATEWAY_INTERFACE");
- putenv("REQUEST_METHOD");
-}
-/* }}} */
+require __DIR__.'/../../../sapi/cgi/tests/include.inc';
$php = get_cgi_path();
reset_env_vars();