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

fixing incorrect --CLEAN-- sections
---

diff --git a/ext/standard/tests/dir/dir_variation8.phpt b/ext/standard/tests/dir/dir_variation8.phpt
index 41217500d4..a0b74a3f61 100644
--- a/ext/standard/tests/dir/dir_variation8.phpt
+++ b/ext/standard/tests/dir/dir_variation8.phpt
@@ -35,15 +35,6 @@ var_dump( dir($dir_path."/sub?dir1") );
 
 echo "Done";
 ?>
---CLEAN--
-<?php
-$file_path = dirname(__FILE__);
-$dir_path = $file_path."/dir_variation81";
-$sub_dir_path = $dir_path."/sub_dir1";
-
-rmdir($dir_path1);
-rmdir($dir_path2);
-?>
 --EXPECTF--
 *** Testing dir() : checking with wildcard characters ***
 -- wildcard = '*' --
diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt
index 4ae960c61b..fd15b92911 100644
Binary files a/ext/standard/tests/strings/strstr.phpt and b/ext/standard/tests/strings/strstr.phpt differ
diff --git a/ext/standard/tests/strings/vfprintf_error1.phpt b/ext/standard/tests/strings/vfprintf_error1.phpt
index b8cc170973..8ef086d353 100644
--- a/ext/standard/tests/strings/vfprintf_error1.phpt
+++ b/ext/standard/tests/strings/vfprintf_error1.phpt
@@ -31,7 +31,7 @@ fclose($fp);
 --CLEAN--
 <?php
 
-$file = 'vfprintf_text.txt';
+$file = 'vfprintf_test.txt';
 unlink( $file );
 
 ?>
diff --git a/ext/standard/tests/strings/vfprintf_error2.phpt b/ext/standard/tests/strings/vfprintf_error2.phpt
index 981b1a745f..bcf7e27690 100644
--- a/ext/standard/tests/strings/vfprintf_error2.phpt
+++ b/ext/standard/tests/strings/vfprintf_error2.phpt
@@ -30,7 +30,7 @@ fclose($fp);
 --CLEAN--
 <?php
 
-$file = 'vfprintf_text.txt';
+$file = 'vfprintf_test.txt';
 unlink( $file );
 
 ?>
diff --git a/ext/standard/tests/strings/vfprintf_error3.phpt b/ext/standard/tests/strings/vfprintf_error3.phpt
index 3edc068074..5a20780672 100644
--- a/ext/standard/tests/strings/vfprintf_error3.phpt
+++ b/ext/standard/tests/strings/vfprintf_error3.phpt
@@ -39,7 +39,7 @@ fclose( $fp );
 --CLEAN--
 <?php
 
-$file = 'vfprintf_text.txt';
+$file = 'vfprintf_test.txt';
 unlink( $file );
 
 ?>
diff --git a/ext/standard/tests/strings/vfprintf_error4.phpt b/ext/standard/tests/strings/vfprintf_error4.phpt
index b1c957240f..131b0477c4 100644
--- a/ext/standard/tests/strings/vfprintf_error4.phpt
+++ b/ext/standard/tests/strings/vfprintf_error4.phpt
@@ -28,7 +28,7 @@ fclose( $fp );
 --CLEAN--
 <?php
 
-$file = 'vfprintf_text.txt';
+$file = 'vfprintf_test.txt';
 unlink( $file );
 
 ?>