Fix opcache test dependencies

atdt · Jan 3, 2017 · 19b757d · 19b757d
1 parent 68ac602
commit 19b757d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/ext/opcache/tests/basic_logging.phpt b/ext/opcache/tests/basic_logging.phpt
@@ -7,6 +7,7 @@ outputs the correct logging at the highest log_verbosity_level
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
+opcache.file_cache_only=0
 opcache.log_verbosity_level=4
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>

diff --git a/ext/opcache/tests/issue0115.phpt b/ext/opcache/tests/issue0115.phpt
@@ -16,28 +16,28 @@ 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"; 
+  echo "Hello from Index 1.\n";
+  require_once "phar://this/hello.php";
 ';
-$p['hello.php'] = "Hello World 1!\n";    
+$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"; 
+  echo "Hello from Index 2.\n";
+  require_once "phar://this/hello.php";
 ';
-$p['hello.php'] = "Hello World 2!\n";    
+$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');
+php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1 -d extension=phar.'.PHP_SHLIB_SUFFIX);
 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 
+<?php
 @unlink(__DIR__ . '/issue0115_1.phar.php');
 @unlink(__DIR__ . '/issue0115_2.phar.php');
 ?>

diff --git a/ext/opcache/tests/issue0149.phpt b/ext/opcache/tests/issue0149.phpt
@@ -20,13 +20,13 @@ $p->setStub($stub);
 unset($p);
 
 include "php_cli_server.inc";
-php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1');
+php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1 -d extension=phar.'.PHP_SHLIB_SUFFIX);
 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 
+<?php
 @unlink(__DIR__ . '/issue0149.phar.php');
 ?>
 --EXPECT--

diff --git a/ext/opcache/tests/log_verbosity_bug.phpt b/ext/opcache/tests/log_verbosity_bug.phpt
@@ -7,6 +7,7 @@ The process should die regardless of the log_verbosity_level.
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
+opcache.file_cache_only=0
 opcache.memory_consumption=999999999
 opcache.log_verbosity_level=-1
 --SKIPIF--