zoe             Mon Jul  6 21:00:37 2009 UTC

  Added files:                 
    /phpruntests/QA/sapi/cgi/tests      009.phpt 008.phpt 007.phpt 006.out 
                                        006.phpt 005.phpt include.inc 
                                        004.phpt 003.phpt 002.phpt 001.phpt 
                                        011.phpt 010.phpt 006.diff 006.php 
                                        006.exp skipif.inc 
  Log:
  compare test failures
  
http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/009.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/009.phpt
+++ phpruntests/QA/sapi/cgi/tests/009.phpt
--TEST--
path info request without exported PATH_INFO
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
<?php

include "include.inc";

$php = get_cgi_path();
reset_env_vars();

$f = tempnam(sys_get_temp_dir(), 'cgitest');

putenv("TRANSLATED_PATH=".$f."/x");
putenv("SCRIPT_FILENAME=".$f."/x");
file_put_contents($f, '<?php var_dump($_SERVER["TRANSLATED_PATH"]); ?>');

echo (`$php -n $f`);

echo "Done\n";

@unlink($f);
?>
--EXPECTF--
X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r

string(%d) "%s/x"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/008.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/008.phpt
+++ phpruntests/QA/sapi/cgi/tests/008.phpt
--TEST--
syntax highlighting
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
<?php

include "include.inc";

$php = get_cgi_path();
reset_env_vars();

$filename = dirname(__FILE__)."/008.test.php";
$code = '
<?php
$test = "var"; //var
/* test class */
class test {
        private $var = array();

        public static function foo(Test $arg) {
                echo "hello";
                var_dump($this);
        }
}

$o = new test;
?>
';

file_put_contents($filename, $code);

var_dump(`"$php" -n -s "$filename"`);
var_dump(`"$php" -n -s "unknown"`);

@unlink($filename);

echo "Done\n";
?>
--EXPECTF--     
string(%d) "X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r

<code><span style="color: #000000">
<br /><span style="color: #0000BB">&lt;?php<br />$test&nbsp;</span><span 
style="color: #007700">=&nbsp;</span><span style="color: 
#DD0000">"var"</span><span style="color: #007700">;&nbsp;</span><span 
style="color: #FF8000">//var<br />/*&nbsp;test&nbsp;class&nbsp;*/<br 
/></span><span style="color: #007700">class&nbsp;</span><span style="color: 
#0000BB">test&nbsp;</span><span style="color: #007700">{<br 
/>&nbsp;&nbsp;&nbsp;&nbsp;private&nbsp;</span><span style="color: 
#0000BB">$var&nbsp;</span><span style="color: #007700">=&nbsp;array();<br /><br 
/>&nbsp;&nbsp;&nbsp;&nbsp;public&nbsp;static&nbsp;function&nbsp;</span><span 
style="color: #0000BB">foo</span><span style="color: #007700">(</span><span 
style="color: #0000BB">Test&nbsp;$arg</span><span style="color: 
#007700">)&nbsp;{<br 
/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;echo&nbsp;</span><span 
style="color: #DD0000">"hello"</span><span style="color: #007700">;<br 
/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span!
 ><span style="color: #0000BB">var_dump</span><span style="color: 
 >#007700">(</span><span style="color: #0000BB">$this</span><span style="color: 
 >#007700">);<br />&nbsp;&nbsp;&nbsp;&nbsp;}<br />}<br /><br /></span><span 
 >style="color: #0000BB">$o&nbsp;</span><span style="color: 
 >#007700">=&nbsp;new&nbsp;</span><span style="color: #0000BB">test</span><span 
 >style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;<br 
 >/></span>
</span>
</code>"
string(%d) "Status: 404 Not Found
X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r

No input file specified.
"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/007.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/007.phpt
+++ phpruntests/QA/sapi/cgi/tests/007.phpt
--TEST--
invalid arguments and error messages
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
<?php
include "include.inc";

$php = get_cgi_path();
reset_env_vars();

var_dump(`"$php" -n -f some.php -f some.php`);
var_dump(`"$php" -n -s -w -l`);

?>
===DONE===
--EXPECTF--     
string(25) "No input file specified.
"
string(31) "No syntax errors detected in -
"
===DONE===

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/006.out?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/006.out
+++ phpruntests/QA/sapi/cgi/tests/006.out
string(82) "No syntax errors detected in 
/mnt/workspace/php53_tmp/sapi/cgi/tests/006.test.php
"
string(25) "No input file specified.
"
string(438) "<br />
<font size='1'><table dir='ltr' border='1' cellspacing='0' cellpadding='1'>
<tr><th align='left' bgcolor='#f57900' colspan="5"><span 
style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! 
)</span> Parse error: syntax error, unexpected T_PRIVATE, expecting '{' in 
/mnt/workspace/php53_tmp/sapi/cgi/tests/006.test.php on line <i>5</i></th></tr>
Errors parsing /mnt/workspace/php53_tmp/sapi/cgi/tests/006.test.php
"
Done
http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/006.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/006.phpt
+++ phpruntests/QA/sapi/cgi/tests/006.phpt
--TEST--
syntax check
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
<?php
include "include.inc";

$php = get_cgi_path();
reset_env_vars();

$filename = dirname(__FILE__)."/006.test.php";

$code = '
<?php

$test = "var";

class test {
        private $var;
}

echo test::$var;

?>
';

file_put_contents($filename, $code);

var_dump(`"$php" -n -l "$filename"`);
var_dump(`"$php" -n -l some.unknown`);

$code = '
<?php

class test 
        private $var;
}

?>
';

file_put_contents($filename, $code);

var_dump(`"$php" -l "$filename" 2>/dev/null`);

@unlink($filename);

echo "Done\n";
?>
--EXPECTF--     
string(%d) "No syntax errors detected in %s006.test.php
"
string(%d) "No input file specified.
"
string(%d) "<br />
<b>Parse error</b>: %s expecting %s{%s in <b>%s006.test.php</b> on line 
<b>5</b><br />
Errors parsing %s006.test.php
"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/005.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/005.phpt
+++ phpruntests/QA/sapi/cgi/tests/005.phpt
--TEST--
using invalid combinations of cmdline options
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
<?php

include "include.inc";

$php = get_cgi_path();
reset_env_vars();

var_dump(`$php -n -a -f 'wrong'`);
var_dump(`$php -n -f 'wrong' -a`);

echo "Done\n";
?>
--EXPECTF--     
string(51) "No input file specified.
Interactive mode enabled

"
string(51) "No input file specified.
Interactive mode enabled

"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/include.inc?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/include.inc
+++ phpruntests/QA/sapi/cgi/tests/include.inc
<?php

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");
}
/* }}} */

?>

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/004.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/004.phpt
+++ phpruntests/QA/sapi/cgi/tests/004.phpt
--TEST--
execute a file with -f
--SKIPIF--
<?php 
include "skipif.inc"; 
?>
--FILE--
<?php

include "include.inc";

$php = get_cgi_path();
reset_env_vars();

$filename = dirname(__FILE__).'/004.test.php';
$code ='
<?php

class test { 
        private $pri; 
}

var_dump(test::$pri);
?>
';

file_put_contents($filename, $code);

var_dump(`$php -n -f "$filename" 2>/dev/null`);
var_dump(`$php -n -f "wrong"`);

@unlink($filename);

echo "Done\n";
?>
--EXPECTF--     
string(%d) "
<br />
<b>Fatal error</b>:  Cannot access private property test::$pri in 
<b>%s004.test.php</b> on line <b>8</b><br />
"
string(25) "No input file specified.
"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/003.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/003.phpt
+++ phpruntests/QA/sapi/cgi/tests/003.phpt
--TEST--
strip comments and whitespace with -w
--SKIPIF--
<?php 
include "skipif.inc"; 
?>
--FILE--
<?php

include "include.inc";

$php = get_cgi_path();
reset_env_vars();

$filename = dirname(__FILE__).'/003.test.php';
$code ='
<?php
/* some test script */

class test { /* {{{ */
        public $var = "test"; //test var
#perl style comment 
        private $pri; /* private attr */

        function foo(/* void */) {
        }
}
/* }}} */

?>
';

file_put_contents($filename, $code);

var_dump(`$php -n -w "$filename"`);
var_dump(`$php -n -w "wrong"`);
var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo() 
{} } ?>" | $php -n -w`);

@unlink($filename);

echo "Done\n";
?>
--EXPECTF--     
string(%d) "X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r


<?php
 class test { public $var = "test"; private $pri; function foo() { } } ?>
"
string(%d) "Status: 404 Not Found
X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r

No input file specified.
"
string(%d) "X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r

<?php  class test { function foo() {} } ?>
"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/002.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/002.phpt
+++ phpruntests/QA/sapi/cgi/tests/002.phpt
--TEST--
defining INI options with -d
--SKIPIF--
<?php 
include "skipif.inc"; 
?>
--FILE--
<?php
include "include.inc";

$php = get_cgi_path();
reset_env_vars();

$file = dirname(__FILE__)."/002.test.php";

file_put_contents($file, '<?php var_dump(ini_get("max_execution_time")); ?>');

var_dump(`$php -n -d max_execution_time=111 $file`);
var_dump(`$php -n -d max_execution_time=500 $file`);
var_dump(`$php -n -d max_execution_time=500 -d max_execution_time=555 $file`);

file_put_contents($file, '<?php var_dump(ini_get("max_execution_time")); 
var_dump(ini_get("upload_tmp_dir")); ?>');

var_dump(`$php -n -d upload_tmp_dir=/test/path -d max_execution_time=555 
$file`);

unlink($file);

echo "Done\n";
?>
--EXPECTF--     
string(%d) "X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r

%unicode|string%(3) "111"
"
string(%d) "X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r

%unicode|string%(3) "500"
"
string(%d) "X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r

%unicode|string%(3) "555"
"
string(%d) "X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r

%unicode|string%(3) "555"
%unicode|string%(10) "/test/path"
"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/001.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/001.phpt
+++ phpruntests/QA/sapi/cgi/tests/001.phpt
--TEST--
version string
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
<?php

include "include.inc";

$php = get_cgi_path();
reset_env_vars();

var_dump(`$php -n -v`);

echo "Done\n";
?>
--EXPECTF--
string(%d) "PHP %s (cgi%s (built: %s
Copyright (c) 1997-20%s The PHP Group
Zend Engine v%s, Copyright (c) 1998-20%s Zend Technologies
"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/011.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/011.phpt
+++ phpruntests/QA/sapi/cgi/tests/011.phpt
--TEST--
header_remove()
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
<?php

include "include.inc";

$php = get_cgi_path();
reset_env_vars();

$f = tempnam(sys_get_temp_dir(), 'cgitest');

function test($script) {
        file_put_contents($GLOBALS['f'], $script);
        $cmd = escapeshellcmd($GLOBALS['php']);
        $cmd .= ' -n -dreport_zend_debug=0 -dhtml_errors=0 ' . 
escapeshellarg($GLOBALS['f']);
        echo "----------\n";
        echo rtrim($script) . "\n";
        echo "----------\n";
        passthru($cmd);
}

test('<?php ?>');
test('<?php header_remove(); ?>');
test('<?php header_remove("X-Foo"); ?>');
test('<?php
header("X-Foo: Bar");
?>');
test('<?php
header("X-Foo: Bar");
header("X-Bar: Baz");
header_remove("X-Foo");
?>');
test('<?php
header("X-Foo: Bar");
header_remove("X-Foo: Bar");
?>');
test('<?php
header("X-Foo: Bar");
header_remove("X-Foo:");
?>');
test('<?php
header("X-Foo: Bar");
header_remove();
?>');
test('<?php
header_remove("");
?>');
test('<?php
header_remove(":");
?>');
test('<?php
header("X-Foo: Bar");
echo "flush\n";
flush();
header_remove("X-Foo");
?>');

@unlink($f);
?>
--EXPECTF--
----------
<?php ?>
----------
X-Powered-By: PHP/%s
Content-type: text/html

----------
<?php header_remove(); ?>
----------
Content-type: text/html

----------
<?php header_remove("X-Foo"); ?>
----------
X-Powered-By: PHP/%s
Content-type: text/html

----------
<?php
header("X-Foo: Bar");
?>
----------
X-Powered-By: PHP/%s
X-Foo: Bar
Content-type: text/html

----------
<?php
header("X-Foo: Bar");
header("X-Bar: Baz");
header_remove("X-Foo");
?>
----------
X-Powered-By: PHP/%s
X-Bar: Baz
Content-type: text/html

----------
<?php
header("X-Foo: Bar");
header_remove("X-Foo: Bar");
?>
----------
X-Powered-By: PHP/%s
X-Foo: Bar
Content-type: text/html


Warning: Header to delete may not contain colon. in %s on line 3
----------
<?php
header("X-Foo: Bar");
header_remove("X-Foo:");
?>
----------
X-Powered-By: PHP/%s
X-Foo: Bar
Content-type: text/html


Warning: Header to delete may not contain colon. in %s on line 3
----------
<?php
header("X-Foo: Bar");
header_remove();
?>
----------
Content-type: text/html

----------
<?php
header_remove("");
?>
----------
X-Powered-By: PHP/%s
Content-type: text/html

----------
<?php
header_remove(":");
?>
----------
X-Powered-By: PHP/%s
Content-type: text/html


Warning: Header to delete may not contain colon. in %s on line 2
----------
<?php
header("X-Foo: Bar");
echo "flush\n";
flush();
header_remove("X-Foo");
?>
----------
X-Powered-By: PHP/%s
X-Foo: Bar
Content-type: text/html

flush

Warning: Cannot modify header information - headers already sent by (output 
started at %s:3) in %s on line 5

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/010.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/010.phpt
+++ phpruntests/QA/sapi/cgi/tests/010.phpt
--TEST--
Bug #45860 (header() function fails to correctly replace all Status lines)
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
<?php

include "include.inc";

$php = get_cgi_path();
reset_env_vars();

$f = tempnam(sys_get_temp_dir(), 'cgitest');

putenv("TRANSLATED_PATH=".$f."/x");
putenv("SCRIPT_FILENAME=".$f."/x");
file_put_contents($f, '<?php
header("HTTP/1.1 403 Forbidden");
header("Status: 403 Also Forbidden");
?>');

echo (`$php -n $f`);

file_put_contents($f, '<?php
header("HTTP/1.1 403 Forbidden");
?>');

echo (`$php -n $f`);

file_put_contents($f, '<?php
header("Status: 403 Also Forbidden");
?>');

echo (`$php -n $f`);

echo "Done\n";

@unlink($f);
?>
--EXPECTF--
Status: 403 Forbidden
X-Powered-By: PHP/%s
Content-type: text/html

Status: 403 Forbidden
X-Powered-By: PHP/%s
Content-type: text/html

X-Powered-By: PHP/%s
Status: 403 Also Forbidden
Content-type: text/html

Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/006.diff?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/006.diff
+++ phpruntests/QA/sapi/cgi/tests/006.diff
006+ <font size='1'><table dir='ltr' border='1' cellspacing='0' cellpadding='1'>
007+ <tr><th align='left' bgcolor='#f57900' colspan="5"><span 
style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! 
)</span> Parse error: syntax error, unexpected T_PRIVATE, expecting '{' in 
/mnt/workspace/php53_tmp/sapi/cgi/tests/006.test.php on line <i>5</i></th></tr>
006- <b>Parse error</b>: %s expecting %s{%s in <b>%s006.test.php</b> on line 
<b>5</b><br />
http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/006.php?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/006.php
+++ phpruntests/QA/sapi/cgi/tests/006.php
<?php
include "include.inc";

$php = get_cgi_path();
reset_env_vars();

$filename = dirname(__FILE__)."/006.test.php";

$code = '
<?php

$test = "var";

class test {
        private $var;
}

echo test::$var;

?>
';

file_put_contents($filename, $code);

var_dump(`"$php" -n -l "$filename"`);
var_dump(`"$php" -n -l some.unknown`);

$code = '
<?php

class test 
        private $var;
}

?>
';

file_put_contents($filename, $code);

var_dump(`"$php" -l "$filename" 2>/dev/null`);

@unlink($filename);

echo "Done\n";
?>

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/006.exp?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/006.exp
+++ phpruntests/QA/sapi/cgi/tests/006.exp
string(%d) "No syntax errors detected in %s006.test.php
"
string(%d) "No input file specified.
"
string(%d) "<br />
<b>Parse error</b>: %s expecting %s{%s in <b>%s006.test.php</b> on line 
<b>5</b><br />
Errors parsing %s006.test.php
"
Done
http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/skipif.inc?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/skipif.inc
+++ phpruntests/QA/sapi/cgi/tests/skipif.inc
<?php

if (substr(php_sapi_name(), 0, 3) == "cgi") {
        exit;
}

if (substr(PHP_OS, 0, 3) == 'WIN') {
        die ("skip not for Windows");
}

include dirname(__FILE__)."/include.inc";

if (!get_cgi_path()) {
        die("skip CGI not found");
}

?>

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to