fix tests: proper temp file names

diff --git a/ext/standard/tests/file/file_basic.phpt b/ext/standard/tests/file/file_basic.phpt
index 6f985555c4d2e929ea20ee8954425a76f19706f2..6b0d4b932326a6558dd55553f384b4fbd94a6340 100644 (file)
--- a/ext/standard/tests/file/file_basic.phpt
+++ b/ext/standard/tests/file/file_basic.phpt
@@ -13,17 +13,17 @@ echo "*** Testing file() with basic types of files ***\n";
 $filetypes = array("numeric", "text", "empty", "text_with_new_line");
 
 foreach( $filetypes as $type ) {
-  create_files($file_path, 1, $type, 0755, 100, "w", "file", 1, "byte");
-  print_r( file($file_path."/file1.tmp") );
-  delete_files($file_path, 1);
+  create_files($file_path, 1, $type, 0755, 100, "w", "file_basic", 1, "byte");
+  print_r( file($file_path."/file_basic1.tmp") );
+  delete_files($file_path, 1, "file_basic");
 }
 
 echo "*** Testing for return type of file() function ***\n";
 foreach( $filetypes as $type ) {
-  create_files($file_path, 1, $type);
-  $ret_arr =  file($file_path."/file1.tmp");
+  create_files($file_path, 1, $type, 0755, 1, "w", "file_basic");
+  $ret_arr =  file($file_path."/file_basic1.tmp");
   var_dump( is_array($ret_arr) );
-  delete_files($file_path, 1);
+  delete_files($file_path, 1, "file_basic");
 }
 
 echo "\n--- Done ---";

diff --git a/ext/standard/tests/file/file_variation.phpt b/ext/standard/tests/file/file_variation.phpt
index d70bbc497fefd2e2b00d2cab04df67c8eaf5b446..7e2c2045855b54cc31412568201086bed1a741ba 100644 (file)
--- a/ext/standard/tests/file/file_variation.phpt
+++ b/ext/standard/tests/file/file_variation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test file() function : Variations
+Test file() function : usage variations
 --FILE--
 <?php
 /* 
@@ -15,39 +15,39 @@ $count=1;
 $file_path = dirname(__FILE__);
 foreach( $data_array as $data ) {
    echo "--Iteration $count --\n";
-   $fh  = fopen($file_path."/file.tmp", "w");
+   $fh  = fopen($file_path."/file_variation.tmp", "w");
    fwrite($fh, (binary)$data);
-   var_dump( file($file_path."/file.tmp", FILE_IGNORE_NEW_LINES) ); 
-   var_dump( file($file_path."/file.tmp", FILE_SKIP_EMPTY_LINES) ); 
+   var_dump( file($file_path."/file_variation.tmp", FILE_IGNORE_NEW_LINES) ); 
+   var_dump( file($file_path."/file_variation.tmp", FILE_SKIP_EMPTY_LINES) ); 
    $count++;
    fclose($fh);
 }
 
 echo "*** Testing with variation in use_include_path argument ***\n";
-$file_path1 = dirname(__FILE__)."/file";
+$file_path1 = dirname(__FILE__)."/file_variation";
 mkdir($file_path1);
-ini_set( 'include_path',$file_path.'/file' );
+ini_set( 'include_path',$file_path.'/file_variation' );
 
-file_put_contents( $file_path1."/file1.tmp", "aaaaaaaaaaaaaaabbbbbbbbbbb111111111222222222" );
-var_dump( file("file1.tmp", FILE_USE_INCLUDE_PATH) );
-var_dump( file($file_path1."/file1.tmp", 1) );
+file_put_contents( $file_path1."/file1_variation.tmp", "aaaaaaaaaaaaaaabbbbbbbbbbb111111111222222222" );
+var_dump( file("file1_variation.tmp", FILE_USE_INCLUDE_PATH) );
+var_dump( file($file_path1."/file1_variation.tmp", 1) );
 
 echo "*** Using file function to remove line containing a key string ***\n";
-$file_handle = fopen($file_path."/file2.tmp", "w");
+$file_handle = fopen($file_path."/file2_variation.tmp", "w");
 $key = "SEARCH_KEY";
 fwrite( $file_handle, (binary)"The key string to be searched is SEARCH_KEY\nLine without key string\nThe key string to be searched is SEARCH_KEY" );
-$out_array = file($file_path."/file2.tmp");
+$out_array = file($file_path."/file2_variation.tmp");
 
 echo "File contents in array form Before replacement of the key\n";
 var_dump( $out_array );
-$file_handle2 = fopen($file_path."/file3.tmp", "w");
+$file_handle2 = fopen($file_path."/file3_variation.tmp", "w");
 // Loop through file content array
 foreach($out_array as $line) {
   if( !strstr( $line, $key ) )
     fputs($file_handle2,$line);
 }
 echo "File contents in array form After replacement of the key\n";
-var_dump( file($file_path."/file3.tmp" ));
+var_dump( file($file_path."/file3_variation.tmp" ));
 fclose($file_handle);
 fclose($file_handle2);
 
@@ -57,11 +57,11 @@ echo "\n--- Done ---";
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
-unlink($file_path."/file.tmp");
-unlink($file_path."/file/file1.tmp");
-unlink($file_path."/file2.tmp");
-unlink($file_path."/file3.tmp");
-rmdir($file_path."/file");
+unlink($file_path."/file_variation.tmp");
+unlink($file_path."/file_variation/file1_variation.tmp");
+unlink($file_path."/file2_variation.tmp");
+unlink($file_path."/file3_variation.tmp");
+rmdir($file_path."/file_variation");
 
 ?>
 --EXPECTF--