test fixes

diff --git a/ext/opcache/tests/bug66338.phpt b/ext/opcache/tests/bug66338.phpt
index ed7f8ab4757e07c53aedfbbec57f42aae48776aa..6553f83f29c60b5819b8f127e46f7cb5db80bcc2 100644 (file)
--- a/ext/opcache/tests/bug66338.phpt
+++ b/ext/opcache/tests/bug66338.phpt
@@ -15,13 +15,13 @@ file_put_contents( "$root-Officials.inc", '<?php
 
 file_put_contents( "$root-clientUS.php", '<?php 
        class LocalTerms { const GOV_LEADER = "Barack Hussein Obama II"; }
-       require "'.$root.'-Officials.inc";
+       require \''.$root.'-Officials.inc\';
        printf( "The President of the USA is %s\n", Officials::getLeader() );
        ' );
 
 file_put_contents( "$root-clientUK.php", '<?php 
        class LocalTerms { const GOV_LEADER = "David William Donald Cameron"; }
-       require "'.$root.'-Officials.inc";
+       require \''.$root.'-Officials.inc\';
        printf( "The Prime Minister of the UK is %s\n", Officials::getLeader() );
        ' );
 

diff --git a/ext/opcache/tests/bug67215.phpt b/ext/opcache/tests/bug67215.phpt
index 24842b4e04ac728563987a922cd59a863f490f76..4a9ac7c7112c2483ebaab046043a07682cd48340 100644 (file)
--- a/ext/opcache/tests/bug67215.phpt
+++ b/ext/opcache/tests/bug67215.phpt
@@ -11,7 +11,7 @@ opcache.file_update_protection=0
 
 $file_c = __DIR__ . "/bug67215.c.php";
 $file_p = __DIR__ . "/bug67215.p.php";
-file_put_contents($file_c, "<?php require \"$file_p\"; class c extends p {} ?>");
+file_put_contents($file_c, "<?php require '$file_p'; class c extends p {} ?>");
 file_put_contents($file_p, '<?php class p { protected $var = ""; } ?>');
 require $file_c;
 $a = new c();

diff --git a/ext/opcache/tests/revalidate_path_01.phpt b/ext/opcache/tests/revalidate_path_01.phpt
index cf2ac0d829683ed82437f66758a5682a54e52d67..82616333342f751f2a5745bb5e85859341ae39d8 100644 (file)
--- a/ext/opcache/tests/revalidate_path_01.phpt
+++ b/ext/opcache/tests/revalidate_path_01.phpt
@@ -25,16 +25,30 @@ while (filemtime($file1) != filemtime($file2)) {
        touch($file1);
        touch($file2);
 }
-@unlink($link);
-@symlink($dir1, $link);
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+       @rmdir($link);
+       $ln = str_replace('/', '\\', $link);
+       $d1 = realpath($dir1);
+       `mklink /j $ln $d1`;
+} else {
+       @unlink($link);
+       @symlink($dir1, $link);
+}
 
 include "php_cli_server.inc";
 //php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.revalidate_path=1');
 php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.revalidate_path=1 -d opcache.file_update_protection=0 -d realpath_cache_size=0');
 echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/main.php');
 echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/main.php');
-@unlink($link);
-@symlink($dir2, $link);
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+       @rmdir($link);
+       $ln = str_replace('/', '\\', $link);
+       $d2 = realpath($dir2);
+       `mklink /j $ln $d2`;
+} else {
+       @unlink($link);
+       @symlink($dir2, $link);
+}
 echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/main.php');
 echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/main.php');
 ?>
@@ -48,7 +62,11 @@ $file1 = "$dir1/index.php";
 $file2 = "$dir2/index.php";
 $main = "$dir/main.php";
 @unlink($main);
-@unlink($link);
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+       @rmdir($link);
+} else {
+       @unlink($link);
+}
 @unlink($file1);
 @unlink($file2);
 @rmdir($dir1);