bjori Wed, 07 Sep 2011 12:05:19 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316338
Log:
Fix cleanup routines
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
U
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
U php/php-src/branches/PHP_5_3/ext/zip/tests/bug53885.phpt
U
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
U
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
U php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt
U php/php-src/branches/PHP_5_4/ext/zip/tests/bug53885.phpt
U php/php-src/trunk/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
U php/php-src/trunk/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
U php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv.phpt
U php/php-src/trunk/ext/standard/tests/file/bug55124.phpt
U php/php-src/trunk/ext/zip/tests/bug53885.phpt
Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -10,7 +10,7 @@
#Test Fest Cesena (Italy) on 2009-06-20
--FILE--
<?php
-$filename = basename(__FILE__, 'phpt').'tmp';
+$filename = __DIR__ . "/SplFileInfo_getGroup_basic";
touch($filename);
$fileInfo = new SplFileInfo($filename);
$expected = filegroup($filename);
@@ -19,7 +19,7 @@
?>
--CLEAN--
<?php
-$filename = basename(__FILE__, 'phpt').'tmp';
+$filename = __DIR__ . "/SplFileInfo_getGroup_basic";
unlink($filename);
?>
--EXPECTF--
Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -10,7 +10,7 @@
#Test Fest Cesena (Italy) on 2009-06-20
--FILE--
<?php
-$filename = basename(__FILE__, 'phpt').'tmp';
+$filename = __DIR__ . "/SplFileInfo_getOwner_basic";
touch($filename);
$fileInfo = new SplFileInfo($filename);
$expected = fileowner($filename);
@@ -19,7 +19,7 @@
?>
--CLEAN--
<?php
-$filename = basename(__FILE__, 'phpt').'tmp';
+$filename = __DIR__ . "/SplFileInfo_getOwner_basic";
unlink($filename);
?>
--EXPECTF--
Modified: php/php-src/branches/PHP_5_3/ext/zip/tests/bug53885.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/zip/tests/bug53885.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_3/ext/zip/tests/bug53885.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -15,5 +15,10 @@
$nx->statName("a",ZIPARCHIVE::FL_UNCHANGED);
?>
==DONE==
+--CLEAN--
+<?php
+$fname = dirname(__FILE__)."/test53885.zip";
+unlink($fname);
+?>
--EXPECTF--
==DONE==
Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -10,7 +10,7 @@
#Test Fest Cesena (Italy) on 2009-06-20
--FILE--
<?php
-$filename = basename(__FILE__, 'phpt').'tmp';
+$filename = __DIR__ . "/SplFileInfo_getGroup_basic";
touch($filename);
$fileInfo = new SplFileInfo($filename);
$expected = filegroup($filename);
@@ -19,7 +19,7 @@
?>
--CLEAN--
<?php
-$filename = basename(__FILE__, 'phpt').'tmp';
+$filename = __DIR__ . "/SplFileInfo_getGroup_basic";
unlink($filename);
?>
--EXPECTF--
Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -10,7 +10,7 @@
#Test Fest Cesena (Italy) on 2009-06-20
--FILE--
<?php
-$filename = basename(__FILE__, 'phpt').'tmp';
+$filename = __DIR__ . "/SplFileInfo_getOwner_basic";
touch($filename);
$fileInfo = new SplFileInfo($filename);
$expected = fileowner($filename);
@@ -19,7 +19,7 @@
?>
--CLEAN--
<?php
-$filename = basename(__FILE__, 'phpt').'tmp';
+$filename = __DIR__ . "/SplFileInfo_getOwner_basic";
unlink($filename);
?>
--EXPECTF--
Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -2,7 +2,7 @@
SplFileObject::fputcsv(): functionality tests
--FILE--
<?php
-$file = 'SplFileObject_fputcsv.csv';
+$file = __DIR__ . '/SplFileObject_fputcsv.csv';
$fo = new SplFileObject($file, 'w');
$list = array (
@@ -55,6 +55,7 @@
<?php exit(0); ?>
--CLEAN--
<?php
+$file = __DIR__ . '/SplFileObject_fputcsv.csv';
unlink($file);
?>
--EXPECT--
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -8,7 +8,7 @@
if (is_dir('a/b')) {
rmdir('a/b');
}
-if (is_dir('/a')) {
+if (is_dir('./a')) {
rmdir('a');
}
chdir($old_dir_path);
Modified: php/php-src/branches/PHP_5_4/ext/zip/tests/bug53885.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/zip/tests/bug53885.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_4/ext/zip/tests/bug53885.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -15,5 +15,10 @@
$nx->statName("a",ZIPARCHIVE::FL_UNCHANGED);
?>
==DONE==
+--CLEAN--
+<?php
+$fname = dirname(__FILE__)."/test53885.zip";
+unlink($fname);
+?>
--EXPECTF--
==DONE==
Modified: php/php-src/trunk/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/trunk/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -10,7 +10,7 @@
#Test Fest Cesena (Italy) on 2009-06-20
--FILE--
<?php
-$filename = basename(__FILE__, 'phpt').'tmp';
+$filename = __DIR__ . "/SplFileInfo_getGroup_basic";
touch($filename);
$fileInfo = new SplFileInfo($filename);
$expected = filegroup($filename);
@@ -19,7 +19,7 @@
?>
--CLEAN--
<?php
-$filename = basename(__FILE__, 'phpt').'tmp';
+$filename = __DIR__ . "/SplFileInfo_getGroup_basic";
unlink($filename);
?>
--EXPECTF--
Modified: php/php-src/trunk/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/trunk/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -10,7 +10,7 @@
#Test Fest Cesena (Italy) on 2009-06-20
--FILE--
<?php
-$filename = basename(__FILE__, 'phpt').'tmp';
+$filename = __DIR__ . "/SplFileInfo_getOwner_basic";
touch($filename);
$fileInfo = new SplFileInfo($filename);
$expected = fileowner($filename);
@@ -19,7 +19,7 @@
?>
--CLEAN--
<?php
-$filename = basename(__FILE__, 'phpt').'tmp';
+$filename = __DIR__ . "/SplFileInfo_getOwner_basic";
unlink($filename);
?>
--EXPECTF--
Modified: php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -2,7 +2,7 @@
SplFileObject::fputcsv(): functionality tests
--FILE--
<?php
-$file = 'SplFileObject_fputcsv.csv';
+$file = __DIR__ . '/SplFileObject_fputcsv.csv';
$fo = new SplFileObject($file, 'w');
$list = array (
@@ -55,6 +55,7 @@
<?php exit(0); ?>
--CLEAN--
<?php
+$file = __DIR__ . '/SplFileObject_fputcsv.csv';
unlink($file);
?>
--EXPECT--
Modified: php/php-src/trunk/ext/standard/tests/file/bug55124.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/bug55124.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/trunk/ext/standard/tests/file/bug55124.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -8,7 +8,7 @@
if (is_dir('a/b')) {
rmdir('a/b');
}
-if (is_dir('/a')) {
+if (is_dir('./a')) {
rmdir('a');
}
chdir($old_dir_path);
Modified: php/php-src/trunk/ext/zip/tests/bug53885.phpt
===================================================================
--- php/php-src/trunk/ext/zip/tests/bug53885.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/trunk/ext/zip/tests/bug53885.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -15,5 +15,10 @@
$nx->statName("a",ZIPARCHIVE::FL_UNCHANGED);
?>
==DONE==
+--CLEAN--
+<?php
+$fname = dirname(__FILE__)."/test53885.zip";
+unlink($fname);
+?>
--EXPECTF--
==DONE==
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
