From: Zoe Slattery <zoe@php.net>
Date: Thu, 16 Apr 2009 12:14:38 +0000 (+0000)
Subject: fixing incorrect --CLEAN-- sections
X-Git-Tag: php-5.3.0RC2~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25ff38141862bc66ae397f9fd67585e997ecec3f;p=php

fixing incorrect --CLEAN-- sections
---

diff --git a/ext/standard/tests/file/005_variation.phpt b/ext/standard/tests/file/005_variation.phpt
index 72580e2a98..e46df865fc 100644
--- a/ext/standard/tests/file/005_variation.phpt
+++ b/ext/standard/tests/file/005_variation.phpt
@@ -156,13 +156,27 @@ echo "Done\n";
 --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 ***
diff --git a/ext/standard/tests/file/copy_variation12.phpt b/ext/standard/tests/file/copy_variation12.phpt
index 76d386e6e9..34667ba799 100644
--- a/ext/standard/tests/file/copy_variation12.phpt
+++ b/ext/standard/tests/file/copy_variation12.phpt
@@ -35,7 +35,6 @@ echo "*** Done ***\n";
 
 --CLEAN--
 <?php
-unlink(dirname(__FILE__)."/copy_copy_variation12");
 rmdir(dirname(__FILE__)."/copy_variation12");
 ?>
 
diff --git a/ext/standard/tests/file/file_get_contents_basic.phpt b/ext/standard/tests/file/file_get_contents_basic.phpt
index 5dc0a5e5c6..413909b450 100644
--- a/ext/standard/tests/file/file_get_contents_basic.phpt
+++ b/ext/standard/tests/file/file_get_contents_basic.phpt
@@ -30,12 +30,6 @@ delete_files($file_path, 1);
 
 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 --
diff --git a/ext/standard/tests/file/file_get_contents_error.phpt b/ext/standard/tests/file/file_get_contents_error.phpt
index 9c30c2357c..631a138a07 100644
--- a/ext/standard/tests/file/file_get_contents_error.phpt
+++ b/ext/standard/tests/file/file_get_contents_error.phpt
@@ -38,9 +38,12 @@ echo "\n*** Done ***\n";
 --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() expects at most 5 parameters, 6 given in %s on line
 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 ***
diff --git a/ext/standard/tests/file/fscanf_variation51.phpt b/ext/standard/tests/file/fscanf_variation51.phpt
index 5b6fbe926b..0f5ab5a612 100644
--- a/ext/standard/tests/file/fscanf_variation51.phpt
+++ b/ext/standard/tests/file/fscanf_variation51.phpt
@@ -61,7 +61,9 @@ echo "\n*** Done ***";
 <?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 ***
diff --git a/ext/standard/tests/file/fscanf_variation52.phpt b/ext/standard/tests/file/fscanf_variation52.phpt
index b917072922..bf82ab8e43 100644
--- a/ext/standard/tests/file/fscanf_variation52.phpt
+++ b/ext/standard/tests/file/fscanf_variation52.phpt
@@ -59,7 +59,9 @@ echo "\n*** Done ***";
 <?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 ***
diff --git a/ext/standard/tests/file/fscanf_variation53.phpt b/ext/standard/tests/file/fscanf_variation53.phpt
index 61a78be026..b65bccf8fd 100644
--- a/ext/standard/tests/file/fscanf_variation53.phpt
+++ b/ext/standard/tests/file/fscanf_variation53.phpt
@@ -74,7 +74,9 @@ echo "\n*** Done ***";
 <?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 ***
diff --git a/ext/standard/tests/file/is_dir_variation1.phpt b/ext/standard/tests/file/is_dir_variation1.phpt
index 4f85ba93bb..1a0b55669f 100644
--- a/ext/standard/tests/file/is_dir_variation1.phpt
+++ b/ext/standard/tests/file/is_dir_variation1.phpt
@@ -29,7 +29,6 @@ echo "\n*** Done ***";
 <?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);
 ?>
diff --git a/ext/standard/tests/file/is_dir_variation2.phpt b/ext/standard/tests/file/is_dir_variation2.phpt
index 022e06bb40..65efeab9a1 100644
--- a/ext/standard/tests/file/is_dir_variation2.phpt
+++ b/ext/standard/tests/file/is_dir_variation2.phpt
@@ -56,12 +56,24 @@ echo "\n*** Done ***";
 --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 ***
diff --git a/ext/standard/tests/file/is_file_error.phpt b/ext/standard/tests/file/is_file_error.phpt
index 1a605d1040..711d761763 100644
--- a/ext/standard/tests/file/is_file_error.phpt
+++ b/ext/standard/tests/file/is_file_error.phpt
@@ -29,8 +29,12 @@ echo "\n*** Done ***";
 --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 ***
diff --git a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
index 5497fd1ac6..e7c41c4a9d 100644
--- a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
+++ b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
@@ -50,7 +50,6 @@ echo "Done\n";
 --CLEAN--
 <?php
 rmdir(dirname(__FILE__)."/mkdir_variation2/test/");
-rmdir(dirname(__FILE__)."/mkdir_variation2/test1/");
 rmdir(dirname(__FILE__)."/mkdir_variation2/");
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/file/readlink_realpath_variation3.phpt b/ext/standard/tests/file/readlink_realpath_variation3.phpt
index 3a157d9d6e..70e8d0c949 100644
--- a/ext/standard/tests/file/readlink_realpath_variation3.phpt
+++ b/ext/standard/tests/file/readlink_realpath_variation3.phpt
@@ -40,15 +40,6 @@ for($loop_counter = 0; $loop_counter < count($link_string); $loop_counter++) {
 
 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 ***
 
diff --git a/ext/standard/tests/file/rename_basic.phpt b/ext/standard/tests/file/rename_basic.phpt
index a45290faa6..c589c514e4 100755
--- a/ext/standard/tests/file/rename_basic.phpt
+++ b/ext/standard/tests/file/rename_basic.phpt
@@ -34,7 +34,6 @@ var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) );
 ===Done===
 --CLEAN--
 <?php
-unlink(dirname(__FILE__)."/rename_basic.tmp");
 unlink(dirname(__FILE__)."/rename_basic_new.tmp");
 ?>
 --EXPECT--
diff --git a/ext/standard/tests/file/rename_variation.phpt b/ext/standard/tests/file/rename_variation.phpt
index ae7a628bd8..00dc309982 100644
--- a/ext/standard/tests/file/rename_variation.phpt
+++ b/ext/standard/tests/file/rename_variation.phpt
@@ -47,13 +47,6 @@ rmdir("$file_path/rename_variation");
 
 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 --
diff --git a/ext/standard/tests/file/rename_variation1.phpt b/ext/standard/tests/file/rename_variation1.phpt
index 4a2f55b37c..0f7321e205 100644
--- a/ext/standard/tests/file/rename_variation1.phpt
+++ b/ext/standard/tests/file/rename_variation1.phpt
@@ -52,8 +52,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--
diff --git a/ext/standard/tests/file/rename_variation2.phpt b/ext/standard/tests/file/rename_variation2.phpt
index 1e4ef4b500..fa3ee1e017 100644
--- a/ext/standard/tests/file/rename_variation2.phpt
+++ b/ext/standard/tests/file/rename_variation2.phpt
@@ -18,7 +18,7 @@ mkdir($dest_dir);
 /* 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 @@ echo "Done\n";
 --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--
diff --git a/ext/standard/tests/file/rename_variation3.phpt b/ext/standard/tests/file/rename_variation3.phpt
index f6565e437b..ce8921630b 100644
--- a/ext/standard/tests/file/rename_variation3.phpt
+++ b/ext/standard/tests/file/rename_variation3.phpt
@@ -44,11 +44,7 @@ echo "Done\n";
 --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--
diff --git a/ext/standard/tests/file/rename_variation4.phpt b/ext/standard/tests/file/rename_variation4.phpt
index 10061c6ae8..2965f7534a 100644
--- a/ext/standard/tests/file/rename_variation4.phpt
+++ b/ext/standard/tests/file/rename_variation4.phpt
@@ -38,9 +38,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");
 rmdir($file_path."/12345");
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/file/rename_variation8.phpt b/ext/standard/tests/file/rename_variation8.phpt
index 650b6c990b..6b3644aee4 100644
--- a/ext/standard/tests/file/rename_variation8.phpt
+++ b/ext/standard/tests/file/rename_variation8.phpt
@@ -41,7 +41,6 @@ echo "Done\n";
 ?>
 --CLEAN--
 <?php
-unlink(dirname(__FILE__)."/rename_basic_new2.tmp");
 rmdir(dirname(__FILE__)."/rename_basic_dir1");
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt
index 2ecd30951b..4df4872f35 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt
@@ -67,7 +67,6 @@ echo "Done\n";
 --CLEAN--
 <?php
 $dirname = dirname(__FILE__)."/symlink_link_linkinfo_is_link_basic2";
-unlink("$dirname/symlink_link_linkinfo_is_link_basic2.tmp");
 rmdir($dirname);
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
index 4cf566ca19..9b9afba10d 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
@@ -76,8 +76,12 @@ echo "Done\n";
 $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 ***