zoe Thu Apr 16 12:14:38 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/file file_get_contents_error.phpt
mkdir_rmdir_variation2.phpt
005_variation.phpt
fscanf_variation53.phpt
rename_variation8.phpt
fscanf_variation52.phpt
is_dir_variation2.phpt
fscanf_variation51.phpt
is_dir_variation1.phpt
rename_variation.phpt
rename_variation4.phpt
rename_variation3.phpt
rename_variation2.phpt
rename_variation1.phpt
rename_basic.phpt
readlink_realpath_variation3.phpt
copy_variation12.phpt
is_file_error.phpt
symlink_link_linkinfo_is_link_basic2.phpt
symlink_link_linkinfo_is_link_variation6.phpt
file_get_contents_basic.phpt
Log:
fixing incorrect --CLEAN-- sections
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_error.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/file/file_get_contents_error.phpt
diff -u php-src/ext/standard/tests/file/file_get_contents_error.phpt:1.1.4.2
php-src/ext/standard/tests/file/file_get_contents_error.phpt:1.1.4.3
--- php-src/ext/standard/tests/file/file_get_contents_error.phpt:1.1.4.2
Wed Nov 26 10:10:17 2008
+++ php-src/ext/standard/tests/file/file_get_contents_error.phpt Thu Apr
16 12:14:38 2009
@@ -38,9 +38,12 @@
--CLEAN--
<?php
$file_path = dirname(__FILE__);
-unlink($file_path."/file_put_contents_error.tmp");
-unlink($file_path."/file_put_contents1.tmp");
-
+if(file_exists($file_path."/file_put_contents_error.tmp")) {
+ unlink($file_path."/file_put_contents_error.tmp");
+}
+if(file_exists($file_path."/file_put_contents1.tmp")) {
+ unlink($file_path."/file_put_contents1.tmp");
+}
?>
--EXPECTF--
*** Testing error conditions ***
@@ -61,4 +64,4 @@
Warning: file_get_contents(): length must be greater than or equal to zero in
%s on line %d
bool(false)
-*** Done ***
\ No newline at end of file
+*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
diff -u php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt:1.1.2.2.2.2
php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt:1.1.2.2.2.3
--- php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt:1.1.2.2.2.2
Fri Dec 12 12:44:48 2008
+++ php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt Thu Apr 16
12:14:38 2009
@@ -50,7 +50,6 @@
--CLEAN--
<?php
rmdir(dirname(__FILE__)."/mkdir_variation2/test/");
-rmdir(dirname(__FILE__)."/mkdir_variation2/test1/");
rmdir(dirname(__FILE__)."/mkdir_variation2/");
?>
--EXPECTF--
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/005_variation.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/005_variation.phpt
diff -u php-src/ext/standard/tests/file/005_variation.phpt:1.1.2.1
php-src/ext/standard/tests/file/005_variation.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/file/005_variation.phpt:1.1.2.1 Mon Jun 11
16:14:59 2007
+++ php-src/ext/standard/tests/file/005_variation.phpt Thu Apr 16 12:14:38 2009
@@ -156,13 +156,27 @@
--CLEAN--
<?php
$file_path = dirname(__FILE__);
-unlink($file_path."/005_variation_softlink.tmp");
-unlink($file_path."/005_variation_hardlink.tmp");
-unlink($file_path."/005_variation1.tmp");
-unlink($file_path."/005_variation_copy.tmp");
-unlink($file_path."/005_variation_touch.tmp");
-unlink($file_path."/005_variation_touch_fly.tmp");
-unlink($file_path."/005_variation_touch_new.tmp");
+if(file_exists($file_path."/005_variation_softlink.tmp")) {
+ unlink($file_path."/005_variation_softlink.tmp");
+}
+if(file_exists($file_path."/005_variation_hardlink.tmp")) {
+ unlink($file_path."/005_variation_hardlink.tmp");
+}
+if(file_exists($file_path."/005_variation1.tmp")) {
+ unlink($file_path."/005_variation1.tmp");
+}
+if(file_exists($file_path."/005_variation_copy.tmp")) {
+ unlink($file_path."/005_variation_copy.tmp");
+}
+if(file_exists($file_path."/005_variation_touch.tmp")) {
+ unlink($file_path."/005_variation_touch.tmp");
+}
+if(file_exists($file_path."/005_variation_touch_fly.tmp")) {
+ unlink($file_path."/005_variation_touch_fly.tmp");
+}
+if(file_exists($file_path."/005_variation_touch_new.tmp")) {
+ unlink($file_path."/005_variation_touch_new.tmp");
+}
?>
--EXPECTF--
*** Testing fileattime(), filemtime(), filectime() & touch() : usage
variations ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fscanf_variation53.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/fscanf_variation53.phpt
diff -u php-src/ext/standard/tests/file/fscanf_variation53.phpt:1.1.2.1.2.1
php-src/ext/standard/tests/file/fscanf_variation53.phpt:1.1.2.1.2.2
--- php-src/ext/standard/tests/file/fscanf_variation53.phpt:1.1.2.1.2.1 Mon Nov
5 17:43:20 2007
+++ php-src/ext/standard/tests/file/fscanf_variation53.phpt Thu Apr 16
12:14:38 2009
@@ -74,7 +74,9 @@
<?php
$file_path = dirname(__FILE__);
$filename = "$file_path/fscanf_variation53.tmp";
-unlink($filename);
+if(file_exists($filename)) {
+ unlink($filename);
+}
?>
--EXPECT--
*** Test fscanf(): to read a file when file pointer is pointing to EOF ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation8.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/rename_variation8.phpt
diff -u php-src/ext/standard/tests/file/rename_variation8.phpt:1.2.2.2
php-src/ext/standard/tests/file/rename_variation8.phpt:1.2.2.3
--- php-src/ext/standard/tests/file/rename_variation8.phpt:1.2.2.2 Wed Apr
30 13:53:52 2008
+++ php-src/ext/standard/tests/file/rename_variation8.phpt Thu Apr 16
12:14:38 2009
@@ -41,7 +41,6 @@
?>
--CLEAN--
<?php
-unlink(dirname(__FILE__)."/rename_basic_new2.tmp");
rmdir(dirname(__FILE__)."/rename_basic_dir1");
?>
--EXPECTF--
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fscanf_variation52.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/fscanf_variation52.phpt
diff -u php-src/ext/standard/tests/file/fscanf_variation52.phpt:1.1.2.1.2.1
php-src/ext/standard/tests/file/fscanf_variation52.phpt:1.1.2.1.2.2
--- php-src/ext/standard/tests/file/fscanf_variation52.phpt:1.1.2.1.2.1 Mon Nov
5 17:43:20 2007
+++ php-src/ext/standard/tests/file/fscanf_variation52.phpt Thu Apr 16
12:14:38 2009
@@ -59,7 +59,9 @@
<?php
$file_path = dirname(__FILE__);
$filename = "$file_path/fscanf_variation52.tmp";
-unlink($filename);
+if(file_exists($filename)) {
+ unlink($filename);
+}
?>
--EXPECT--
*** Test fscanf(): to read an empty file ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_dir_variation2.phpt?r1=1.1.2.2.2.4&r2=1.1.2.2.2.5&diff_format=u
Index: php-src/ext/standard/tests/file/is_dir_variation2.phpt
diff -u php-src/ext/standard/tests/file/is_dir_variation2.phpt:1.1.2.2.2.4
php-src/ext/standard/tests/file/is_dir_variation2.phpt:1.1.2.2.2.5
--- php-src/ext/standard/tests/file/is_dir_variation2.phpt:1.1.2.2.2.4 Tue Dec
30 16:49:43 2008
+++ php-src/ext/standard/tests/file/is_dir_variation2.phpt Thu Apr 16
12:14:38 2009
@@ -56,12 +56,24 @@
--CLEAN--
<?php
$file_path = dirname(__FILE__);
-unlink($file_path."/is_dir_variation2_symlink");
-unlink($file_path."/is_dir_variation2_link");
-unlink($file_path."/is_dir_variation2_symlink.tmp");
-unlink($file_path."/is_dir_variation2_link.tmp");
-unlink($file_path."/is_dir_variation2.tmp");
-rmdir($file_path."/is_dir_variation2");
+if(file_exists($file_path."/is_dir_variation2_symlink")) {
+ unlink($file_path."/is_dir_variation2_symlink");
+}
+if(file_exists($file_path."/is_dir_variation2_symlink")) {
+ unlink($file_path."/is_dir_variation2_symlink");
+}
+if(file_exists($file_path."/is_dir_variation2_symlink.tmp")) {
+ unlink($file_path."/is_dir_variation2_symlink.tmp");
+}
+if(file_exists($file_path."/is_dir_variation2_link.tmp")) {
+ unlink($file_path."/is_dir_variation2_link.tmp");
+}
+if(file_exists($file_path."/is_dir_variation2.tmp")) {
+ unlink($file_path."/is_dir_variation2.tmp");
+}
+if(file_exists($file_path."/is_dir_variation2")) {
+ rmdir($file_path."/is_dir_variation2");
+}
?>
--EXPECTF--
*** Testing is_dir() with dir and links to dir ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fscanf_variation51.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/fscanf_variation51.phpt
diff -u php-src/ext/standard/tests/file/fscanf_variation51.phpt:1.1.2.1.2.1
php-src/ext/standard/tests/file/fscanf_variation51.phpt:1.1.2.1.2.2
--- php-src/ext/standard/tests/file/fscanf_variation51.phpt:1.1.2.1.2.1 Mon Nov
5 17:43:20 2007
+++ php-src/ext/standard/tests/file/fscanf_variation51.phpt Thu Apr 16
12:14:38 2009
@@ -61,7 +61,9 @@
<?php
$file_path = dirname(__FILE__);
$filename = "$file_path/fscanf_variation51.tmp";
-unlink($filename);
+if(file_exists($filename)) {
+ unlink($filename);
+}
?>
--EXPECT--
*** Test fscanf(): to read from a file opened in write only mode ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_dir_variation1.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/is_dir_variation1.phpt
diff -u php-src/ext/standard/tests/file/is_dir_variation1.phpt:1.1.2.2
php-src/ext/standard/tests/file/is_dir_variation1.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/file/is_dir_variation1.phpt:1.1.2.2 Sat Jul
21 17:31:42 2007
+++ php-src/ext/standard/tests/file/is_dir_variation1.phpt Thu Apr 16
12:14:38 2009
@@ -29,7 +29,6 @@
<?php
$file_path = dirname(__FILE__);
$dir_name = $file_path."/is_dir_variation1";
-unlink($file_path."/is_dir_variation1.tmp");
rmdir($dir_name."/is_dir_variation1_sub");
rmdir($dir_name);
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation.phpt?r1=1.1.2.3&r2=1.1.2.3.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/rename_variation.phpt
diff -u php-src/ext/standard/tests/file/rename_variation.phpt:1.1.2.3
php-src/ext/standard/tests/file/rename_variation.phpt:1.1.2.3.2.1
--- php-src/ext/standard/tests/file/rename_variation.phpt:1.1.2.3 Wed Sep
12 08:27:35 2007
+++ php-src/ext/standard/tests/file/rename_variation.phpt Thu Apr 16
12:14:38 2009
@@ -47,13 +47,6 @@
echo "Done\n";
?>
---CLEAN--
-<?php
-$file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation_link.tmp");
-unlink($file_path."/rename_variation.tmp");
-rmdir($file_path."/rename_variation_dir");
-?>
--EXPECTF--
*** Testing rename() : rename files across directories ***
-- Iteration 1 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation4.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/rename_variation4.phpt
diff -u php-src/ext/standard/tests/file/rename_variation4.phpt:1.1.2.2
php-src/ext/standard/tests/file/rename_variation4.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/file/rename_variation4.phpt:1.1.2.2 Fri Jun
29 12:56:49 2007
+++ php-src/ext/standard/tests/file/rename_variation4.phpt Thu Apr 16
12:14:38 2009
@@ -38,9 +38,6 @@
--CLEAN--
<?php
$file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation_link.tmp");
-unlink($file_path."/rename_variation.tmp");
-rmdir($file_path."/rename_variation_dir");
rmdir($file_path."/12345");
?>
--EXPECTF--
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation3.phpt?r1=1.2.2.2&r2=1.2.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/rename_variation3.phpt
diff -u php-src/ext/standard/tests/file/rename_variation3.phpt:1.2.2.2
php-src/ext/standard/tests/file/rename_variation3.phpt:1.2.2.2.2.1
--- php-src/ext/standard/tests/file/rename_variation3.phpt:1.2.2.2 Fri Jun
29 12:56:49 2007
+++ php-src/ext/standard/tests/file/rename_variation3.phpt Thu Apr 16
12:14:38 2009
@@ -44,11 +44,7 @@
--CLEAN--
<?php
$file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation1.tmp");
-unlink($file_path."/rename_variation_link.tmp");
unlink($file_path."/rename_variation_hard_link1.tmp");
-unlink($file_path."/rename_variation_hard_link2.tmp");
-unlink($file_path."/rename_variation.tmp");
rmdir($file_path."/rename_variation_dir");
?>
--EXPECTF--
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation2.phpt?r1=1.2.2.3&r2=1.2.2.3.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/rename_variation2.phpt
diff -u php-src/ext/standard/tests/file/rename_variation2.phpt:1.2.2.3
php-src/ext/standard/tests/file/rename_variation2.phpt:1.2.2.3.2.1
--- php-src/ext/standard/tests/file/rename_variation2.phpt:1.2.2.3 Thu Jul
19 12:16:30 2007
+++ php-src/ext/standard/tests/file/rename_variation2.phpt Thu Apr 16
12:14:38 2009
@@ -18,7 +18,7 @@
/* Testing rename() on soft and hard links with different permissions */
echo "\n*** Testing rename() on soft links ***\n";
// create the file
-$filename = $file_path."/rename_variation1.tmp";
+$filename = $file_path."/rename_variation2.tmp";
@unlink($filename);
var_dump(touch($filename));
@@ -49,9 +49,7 @@
--CLEAN--
<?php
$file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation1.tmp");
-unlink($file_path."/rename_variation_link.tmp");
-unlink($file_path."/rename_variation.tmp");
+unlink($file_path."/rename_variation2.tmp");
rmdir($file_path."/rename_variation_dir");
?>
--EXPECTF--
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation1.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/rename_variation1.phpt
diff -u php-src/ext/standard/tests/file/rename_variation1.phpt:1.1.2.2
php-src/ext/standard/tests/file/rename_variation1.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/file/rename_variation1.phpt:1.1.2.2 Fri Jun
29 12:56:49 2007
+++ php-src/ext/standard/tests/file/rename_variation1.phpt Thu Apr 16
12:14:38 2009
@@ -52,8 +52,6 @@
--CLEAN--
<?php
$file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation_link.tmp");
-unlink($file_path."/rename_variation.tmp");
rmdir($file_path."/rename_variation_dir");
?>
--EXPECTF--
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_basic.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/rename_basic.phpt
diff -u php-src/ext/standard/tests/file/rename_basic.phpt:1.1.2.1.2.2
php-src/ext/standard/tests/file/rename_basic.phpt:1.1.2.1.2.3
--- php-src/ext/standard/tests/file/rename_basic.phpt:1.1.2.1.2.2 Thu Jan
8 10:40:36 2009
+++ php-src/ext/standard/tests/file/rename_basic.phpt Thu Apr 16 12:14:38 2009
@@ -34,7 +34,6 @@
===Done===
--CLEAN--
<?php
-unlink(dirname(__FILE__)."/rename_basic.tmp");
unlink(dirname(__FILE__)."/rename_basic_new.tmp");
?>
--EXPECT--
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_variation3.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_variation3.phpt
diff -u
php-src/ext/standard/tests/file/readlink_realpath_variation3.phpt:1.1.2.1
php-src/ext/standard/tests/file/readlink_realpath_variation3.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/file/readlink_realpath_variation3.phpt:1.1.2.1
Mon Jul 9 17:38:33 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_variation3.phpt Thu Apr
16 12:14:38 2009
@@ -40,15 +40,6 @@
echo "Done\n";
?>
---CLEAN--
-<?php
-$name_prefix = dirname(__FILE__)."/readlink_realpath_variation2";
-unlink("$name_prefix/home/tests/link/readlink_realpath_variation2.tmp");
-rmdir("$name_prefix/home/tests/link/");
-rmdir("$name_prefix/home/tests/");
-rmdir("$name_prefix/home/");
-rmdir("$name_prefix/");
-?>
--EXPECTF--
*** Testing readlink() and realpath() : usage variations ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation12.phpt?r1=1.1.2.3&r2=1.1.2.3.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/copy_variation12.phpt
diff -u php-src/ext/standard/tests/file/copy_variation12.phpt:1.1.2.3
php-src/ext/standard/tests/file/copy_variation12.phpt:1.1.2.3.2.1
--- php-src/ext/standard/tests/file/copy_variation12.phpt:1.1.2.3 Mon Aug
20 03:37:39 2007
+++ php-src/ext/standard/tests/file/copy_variation12.phpt Thu Apr 16
12:14:38 2009
@@ -35,7 +35,6 @@
--CLEAN--
<?php
-unlink(dirname(__FILE__)."/copy_copy_variation12");
rmdir(dirname(__FILE__)."/copy_variation12");
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_file_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/is_file_error.phpt
diff -u php-src/ext/standard/tests/file/is_file_error.phpt:1.1.2.1.2.1
php-src/ext/standard/tests/file/is_file_error.phpt:1.1.2.1.2.2
--- php-src/ext/standard/tests/file/is_file_error.phpt:1.1.2.1.2.1 Mon Nov
5 17:43:21 2007
+++ php-src/ext/standard/tests/file/is_file_error.phpt Thu Apr 16 12:14:38 2009
@@ -29,8 +29,12 @@
--CLEAN--
<?php
$file_path = dirname(__FILE__);
-unlink($file_path."/is_file_error.tmp");
-unlink($file_path."/is_file_error1.tmp");
+if(file_exists($file_path."/is_file_error.tmp")) {
+ unlink($file_path."/is_file_error.tmp");
+}
+if(file_exists($file_path."/is_file_error1.tmp")) {
+ unlink($file_path."/is_file_error1.tmp");
+}
?>
--EXPECTF--
*** Testing is_file() error conditions ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt
diff -u
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt:1.1.2.1
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt:1.1.2.1.2.1
---
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt:1.1.2.1
Thu Jul 5 18:53:34 2007
+++ php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt
Thu Apr 16 12:14:38 2009
@@ -67,7 +67,6 @@
--CLEAN--
<?php
$dirname = dirname(__FILE__)."/symlink_link_linkinfo_is_link_basic2";
-unlink("$dirname/symlink_link_linkinfo_is_link_basic2.tmp");
rmdir($dirname);
?>
--EXPECTF--
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt?r1=1.1.2.4&r2=1.1.2.4.2.1&diff_format=u
Index:
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
diff -u
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt:1.1.2.4
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt:1.1.2.4.2.1
---
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt:1.1.2.4
Thu Sep 13 18:24:26 2007
+++
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
Thu Apr 16 12:14:38 2009
@@ -76,8 +76,12 @@
$file_path = dirname(__FILE__);
$dirname = "$file_path/symlink_link_linkinfo_is_link_variation6";
$filename = "$dirname/symlink_link_linkinfo_is_link_variation6.tmp";
+if(file_exists($filename)) {
unlink($filename);
+}
+if(file_exists($dirname)) {
rmdir($dirname);
+}
?>
--EXPECTF--
*** Creating links in a directory without permission to allow the operation ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_basic.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/file/file_get_contents_basic.phpt
diff -u php-src/ext/standard/tests/file/file_get_contents_basic.phpt:1.1.4.2
php-src/ext/standard/tests/file/file_get_contents_basic.phpt:1.1.4.3
--- php-src/ext/standard/tests/file/file_get_contents_basic.phpt:1.1.4.2
Wed Nov 26 10:10:16 2008
+++ php-src/ext/standard/tests/file/file_get_contents_basic.phpt Thu Apr
16 12:14:38 2009
@@ -30,12 +30,6 @@
echo "\n*** Done ***";
?>
---CLEAN--
-<?php
-$file_path = dirname(__FILE__);
-unlink($file_path."/file_put_contents.tmp");
-unlink($file_path."/file_put_contents1.tmp");
-?>
--EXPECTF--
*** Testing the basic functionality of the file_get_contents() function ***
-- Testing with simple valid data file --
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
