From: Greg Beaver <cellog@php.net>
Date: Sat, 26 Apr 2008 16:57:14 +0000 (+0000)
Subject: fix cleanup
X-Git-Tag: RELEASE_2_0_0b1~197
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6b617eca88e903d7f3fcb4205fe4d5f5ef96b58;p=php

fix cleanup
---

diff --git a/ext/phar/tests/phar_extract.phpt b/ext/phar/tests/phar_extract.phpt
index ab71f04dda..6f464f0768 100644
--- a/ext/phar/tests/phar_extract.phpt
+++ b/ext/phar/tests/phar_extract.phpt
@@ -80,7 +80,7 @@ echo $e->getMessage(), "\n";
 --CLEAN--
 <?php
 @unlink(dirname(__FILE__) . '/oops');
-@unlink(dirname(__FILE__) . '/oops1');
+@rmdir(dirname(__FILE__) . '/oops1');
 @unlink(dirname(__FILE__) . '/tempmanifest1.phar.php');
 $e = dirname(__FILE__) . '/extract/';
 @unlink($e . 'file1.txt');
@@ -91,11 +91,13 @@ $e = dirname(__FILE__) . '/extract/';
 @rmdir($e . 'one/level');
 @rmdir($e . 'one');
 @rmdir($e);
-$e = dirname($e) . '/extract1/';
+$e = dirname(__FILE__) . '/extract1/';
 @unlink($e . 'file1.txt');
 @unlink($e . 'subdir/ectory/file.txt');
-@unlink($e);
-$e = dirname($e) . '/extract2/';
+@rmdir($e . 'subdir/ectory');
+@rmdir($e . 'subdir');
+@rmdir($e);
+$e = dirname(__FILE__) . '/extract2/';
 @unlink($e . 'file2.txt');
 @rmdir($e . 'one/level');
 @rmdir($e . 'one');