Test cleanup improvements, files might be locked in the test process

4 files changed, 21 insertions, 6 deletions

diff --git a/ext/standard/tests/file/bug65272.phpt b/ext/standard/tests/file/bug65272.phpt
index 04a5c2d5d5..3a772a8037 100644
--- a/ext/standard/tests/file/bug65272.phpt
+++ b/ext/standard/tests/file/bug65272.phpt
@@ -7,7 +7,7 @@ if (stripos(PHP_OS, 'win') !== 0) die("skip windows required");
 --FILE--
 <?php
 
-$file = dirname(__FILE__)."/flock.dat";
+$file = dirname(__FILE__)."/flock_bug65272.dat";
 
 $fp1 = fopen($file, "w");
 var_dump(flock($fp1, LOCK_SH));
@@ -16,9 +16,13 @@ $fp2 = fopen($file, "r");
 var_dump(flock($fp2, LOCK_EX|LOCK_NB, $wouldblock));
 var_dump($wouldblock);
 
-@unlink($file);
 echo "Done\n";
 ?>
+--CLEAN--
+<?php
+$file = dirname(__FILE__)."/flock_bug65272.dat";
+unlink($file);
+?>
 --EXPECTF--
 bool(true)
 bool(false)
diff --git a/ext/standard/tests/file/fgetss1.phpt b/ext/standard/tests/file/fgetss1.phpt
index 96b8b6f532..58dd00c11a 100644
--- a/ext/standard/tests/file/fgetss1.phpt
+++ b/ext/standard/tests/file/fgetss1.phpt
@@ -29,10 +29,13 @@ foreach ($array as $str) {
 	var_dump(fgetss($fp, 10, "<script>,<a>"));
 }
 
-@unlink($filename);
-
 echo "Done\n";
 ?>
+--CLEAN--
+<?php
+$filename = dirname(__FILE__)."/fgetss1.html";
+unlink($filename);
+?>
 --EXPECTF--	
 string(21) "askasdfasdf<b>aaaaaa
 "
diff --git a/ext/standard/tests/file/flock.phpt b/ext/standard/tests/file/flock.phpt
index 55aae4ab5a..ab08de5256 100644
--- a/ext/standard/tests/file/flock.phpt
+++ b/ext/standard/tests/file/flock.phpt
@@ -33,9 +33,13 @@ var_dump($would);
 var_dump(flock($fp, -1));
 var_dump(flock($fp, 0));
 
-@unlink($file);
 echo "Done\n";
 ?>
+--CLEAN--
+<?php
+$file = dirname(__FILE__)."/flock.dat";
+unlink($file);
+?>
 --EXPECTF--	
 Warning: flock() expects at least 2 parameters, 0 given in %s on line %d
 NULL
diff --git a/ext/standard/tests/file/fscanf.phpt b/ext/standard/tests/file/fscanf.phpt
index 003dd53dfa..700439fcb5 100644
--- a/ext/standard/tests/file/fscanf.phpt
+++ b/ext/standard/tests/file/fscanf.phpt
@@ -56,9 +56,13 @@ file_put_contents($filename, "data");
 $fp = fopen($filename, "rt");
 var_dump(fscanf($fp, "%s%d", $v));
 
-@unlink($filename);
 echo "Done\n";
 ?>
+--CLEAN--
+<?php
+$filename = dirname(__FILE__)."/fscanf.dat";
+unlink($filename);
+?>
 --EXPECTF--	
 Warning: fscanf() expects at least 2 parameters, 0 given in %s on line %d
 NULL