com php-src: Fix dos style eol in phpts: ext/opcache/tests/issue0115.phpt ext/opcache/tests/issue0140.phpt ext/opcache/tests/issue0149.phpt

Commit: 6699b1f8ead84c5ea96df4b4eae5f9b6ed96bc5d Author: Xinchen Hui <laruence@php.net> Mon, 30 Dec 2013 10:58:01 +0800 Parents: 04c8ce259fb422c7bcdac3d72bacbf0ee910d772 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6699b1f8ead84c5ea96df4b4eae5f9b6ed96bc5d Log: Fix dos style eol in phpts Changed paths: M ext/opcache/tests/issue0115.phpt M ext/opcache/tests/issue0140.phpt M ext/opcache/tests/issue0149.phpt Diff: diff --git a/ext/opcache/tests/issue0115.phpt b/ext/opcache/tests/issue0115.phpt index a1e469f..0dfdd9f 100644 --- a/ext/opcache/tests/issue0115.phpt +++ b/ext/opcache/tests/issue0115.phpt @@ -1,48 +1,48 @@ ---TEST-- -ISSUE #115 (path issue when using phar) ---INI-- -opcache.enable=1 -opcache.enable_cli=1 -phar.readonly=0 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> -<?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?> ---FILE-- -<?php -$stub = '<?php -Phar::interceptFileFuncs(); -require "phar://this/index.php"; -__HALT_COMPILER(); ?>'; -$p = new Phar(__DIR__ . '/issue0115_1.phar.php', 0, 'this'); -$p['index.php'] = '<?php -echo "Hello from Index 1.\n"; -require_once "phar://this/hello.php"; -'; -$p['hello.php'] = "Hello World 1!\n"; -$p->setStub($stub); -unset($p); -$p = new Phar(__DIR__ . '/issue0115_2.phar.php', 0, 'this'); -$p['index.php'] = '<?php -echo "Hello from Index 2.\n"; -require_once "phar://this/hello.php"; -'; -$p['hello.php'] = "Hello World 2!\n"; -$p->setStub($stub); -unset($p); - -include "php_cli_server.inc"; -php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1'); -echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0115_1.phar.php'); -echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0115_2.phar.php'); -?> ---CLEAN-- -<?php -@unlink(__DIR__ . '/issue0115_1.phar.php'); -@unlink(__DIR__ . '/issue0115_2.phar.php'); -?> ---EXPECT-- -Hello from Index 1. -Hello World 1! -Hello from Index 2. -Hello World 2! +--TEST-- +ISSUE #115 (path issue when using phar) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +phar.readonly=0 +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +<?php if (!extension_loaded("phar")) die("skip"); ?> +<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?> +--FILE-- +<?php +$stub = '<?php +Phar::interceptFileFuncs(); +require "phar://this/index.php"; +__HALT_COMPILER(); ?>'; +$p = new Phar(__DIR__ . '/issue0115_1.phar.php', 0, 'this'); +$p['index.php'] = '<?php +echo "Hello from Index 1.\n"; +require_once "phar://this/hello.php"; +'; +$p['hello.php'] = "Hello World 1!\n"; +$p->setStub($stub); +unset($p); +$p = new Phar(__DIR__ . '/issue0115_2.phar.php', 0, 'this'); +$p['index.php'] = '<?php +echo "Hello from Index 2.\n"; +require_once "phar://this/hello.php"; +'; +$p['hello.php'] = "Hello World 2!\n"; +$p->setStub($stub); +unset($p); + +include "php_cli_server.inc"; +php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1'); +echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0115_1.phar.php'); +echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0115_2.phar.php'); +?> +--CLEAN-- +<?php +@unlink(__DIR__ . '/issue0115_1.phar.php'); +@unlink(__DIR__ . '/issue0115_2.phar.php'); +?> +--EXPECT-- +Hello from Index 1. +Hello World 1! +Hello from Index 2. +Hello World 2! diff --git a/ext/opcache/tests/issue0140.phpt b/ext/opcache/tests/issue0140.phpt index 7c0d6b9..98e0e45 100644 --- a/ext/opcache/tests/issue0140.phpt +++ b/ext/opcache/tests/issue0140.phpt @@ -1,43 +1,43 @@ ---TEST-- -Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq" ---INI-- -opcache.enable=1 -opcache.enable_cli=1 -opcache.revalidate_freq=0 -opcache.file_update_protection=0 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> -<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?> ---FILE-- -<?php -define("FILENAME", dirname(__FILE__) . "/issuer0140.inc.php"); -file_put_contents(FILENAME, "1\n"); - -var_dump(is_readable(FILENAME)); -include(FILENAME); -var_dump(filemtime(FILENAME)); - -sleep(2); -file_put_contents(FILENAME, "2\n"); - -var_dump(is_readable(FILENAME)); -include(FILENAME); -var_dump(filemtime(FILENAME)); - -sleep(2); -unlink(FILENAME); - -var_dump(is_readable(FILENAME)); -var_dump(@include(FILENAME)); -var_dump(@filemtime(FILENAME)); -?> ---EXPECTF-- -bool(true) -1 -int(%d) -bool(true) -2 -int(%d) -bool(false) -bool(false) -bool(false) +--TEST-- +Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq" +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.revalidate_freq=0 +opcache.file_update_protection=0 +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?> +--FILE-- +<?php +define("FILENAME", dirname(__FILE__) . "/issuer0140.inc.php"); +file_put_contents(FILENAME, "1\n"); + +var_dump(is_readable(FILENAME)); +include(FILENAME); +var_dump(filemtime(FILENAME)); + +sleep(2); +file_put_contents(FILENAME, "2\n"); + +var_dump(is_readable(FILENAME)); +include(FILENAME); +var_dump(filemtime(FILENAME)); + +sleep(2); +unlink(FILENAME); + +var_dump(is_readable(FILENAME)); +var_dump(@include(FILENAME)); +var_dump(@filemtime(FILENAME)); +?> +--EXPECTF-- +bool(true) +1 +int(%d) +bool(true) +2 +int(%d) +bool(false) +bool(false) +bool(false) diff --git a/ext/opcache/tests/issue0149.phpt b/ext/opcache/tests/issue0149.phpt index 7044d39..8c7f1bb 100644 --- a/ext/opcache/tests/issue0149.phpt +++ b/ext/opcache/tests/issue0149.phpt @@ -1,35 +1,35 @@ ---TEST-- -ISSUE #149 (Phar mount points not working this OPcache enabled) ---INI-- -opcache.enable=1 -opcache.enable_cli=1 -phar.readonly=0 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> -<?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?> ---FILE-- -<?php -$stub = "<?php header('Content-Type: text/plain;'); -Phar::mount('this.file', '". __FILE__ . "'); -echo 'OK\n'; -__HALT_COMPILER(); ?>"; -$p = new Phar(__DIR__ . '/issue0149.phar.php', 0, 'this'); -$p['index.php'] = ""; # A Phar must have at least one file, hence this dummy -$p->setStub($stub); -unset($p); - -include "php_cli_server.inc"; -php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1'); -echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0149.phar.php'); -echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0149.phar.php'); -echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0149.phar.php'); -?> ---CLEAN-- -<?php -@unlink(__DIR__ . '/issue0149.phar.php'); -?> ---EXPECT-- -OK -OK -OK +--TEST-- +ISSUE #149 (Phar mount points not working this OPcache enabled) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +phar.readonly=0 +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +<?php if (!extension_loaded("phar")) die("skip"); ?> +<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?> +--FILE-- +<?php +$stub = "<?php header('Content-Type: text/plain;'); +Phar::mount('this.file', '". __FILE__ . "'); +echo 'OK\n'; +__HALT_COMPILER(); ?>"; +$p = new Phar(__DIR__ . '/issue0149.phar.php', 0, 'this'); +$p['index.php'] = ""; # A Phar must have at least one file, hence this dummy +$p->setStub($stub); +unset($p); + +include "php_cli_server.inc"; +php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1'); +echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0149.phar.php'); +echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0149.phar.php'); +echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0149.phar.php'); +?> +--CLEAN-- +<?php +@unlink(__DIR__ . '/issue0149.phar.php'); +?> +--EXPECT-- +OK +OK +OK