Fix cleanup routines

This commit is contained in:
Hannes Magnusson 2011-09-07 12:05:19 +00:00
parent a2252e527f
commit 04044dd07e
5 changed files with 12 additions and 6 deletions

View file

@ -10,7 +10,7 @@ Jacopo Romei <jacopo@sviluppoagile.it>
#Test Fest Cesena (Italy) on 2009-06-20 #Test Fest Cesena (Italy) on 2009-06-20
--FILE-- --FILE--
<?php <?php
$filename = basename(__FILE__, 'phpt').'tmp'; $filename = __DIR__ . "/SplFileInfo_getGroup_basic";
touch($filename); touch($filename);
$fileInfo = new SplFileInfo($filename); $fileInfo = new SplFileInfo($filename);
$expected = filegroup($filename); $expected = filegroup($filename);
@ -19,7 +19,7 @@ var_dump($expected == $actual);
?> ?>
--CLEAN-- --CLEAN--
<?php <?php
$filename = basename(__FILE__, 'phpt').'tmp'; $filename = __DIR__ . "/SplFileInfo_getGroup_basic";
unlink($filename); unlink($filename);
?> ?>
--EXPECTF-- --EXPECTF--

View file

@ -10,7 +10,7 @@ Jacopo Romei <jacopo@sviluppoagile.it>
#Test Fest Cesena (Italy) on 2009-06-20 #Test Fest Cesena (Italy) on 2009-06-20
--FILE-- --FILE--
<?php <?php
$filename = basename(__FILE__, 'phpt').'tmp'; $filename = __DIR__ . "/SplFileInfo_getOwner_basic";
touch($filename); touch($filename);
$fileInfo = new SplFileInfo($filename); $fileInfo = new SplFileInfo($filename);
$expected = fileowner($filename); $expected = fileowner($filename);
@ -19,7 +19,7 @@ var_dump($expected == $actual);
?> ?>
--CLEAN-- --CLEAN--
<?php <?php
$filename = basename(__FILE__, 'phpt').'tmp'; $filename = __DIR__ . "/SplFileInfo_getOwner_basic";
unlink($filename); unlink($filename);
?> ?>
--EXPECTF-- --EXPECTF--

View file

@ -2,7 +2,7 @@
SplFileObject::fputcsv(): functionality tests SplFileObject::fputcsv(): functionality tests
--FILE-- --FILE--
<?php <?php
$file = 'SplFileObject_fputcsv.csv'; $file = __DIR__ . '/SplFileObject_fputcsv.csv';
$fo = new SplFileObject($file, 'w'); $fo = new SplFileObject($file, 'w');
$list = array ( $list = array (
@ -55,6 +55,7 @@ echo '$list = ';var_export($res);echo ";\n";
<?php exit(0); ?> <?php exit(0); ?>
--CLEAN-- --CLEAN--
<?php <?php
$file = __DIR__ . '/SplFileObject_fputcsv.csv';
unlink($file); unlink($file);
?> ?>
--EXPECT-- --EXPECT--

View file

@ -8,7 +8,7 @@ mkdir('a/./b', 0755, true);
if (is_dir('a/b')) { if (is_dir('a/b')) {
rmdir('a/b'); rmdir('a/b');
} }
if (is_dir('/a')) { if (is_dir('./a')) {
rmdir('a'); rmdir('a');
} }
chdir($old_dir_path); chdir($old_dir_path);

View file

@ -15,5 +15,10 @@ $nx->locateName("a",ZIPARCHIVE::FL_UNCHANGED);
$nx->statName("a",ZIPARCHIVE::FL_UNCHANGED); $nx->statName("a",ZIPARCHIVE::FL_UNCHANGED);
?> ?>
==DONE== ==DONE==
--CLEAN--
<?php
$fname = dirname(__FILE__)."/test53885.zip";
unlink($fname);
?>
--EXPECTF-- --EXPECTF--
==DONE== ==DONE==