From: Steph Fox <sfox@php.net>
Date: Wed, 20 Feb 2008 13:33:00 +0000 (+0000)
Subject: Fix 'clean' sections
X-Git-Tag: RELEASE_2_0_0a1~417
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8febc7fd54e52c73c411b2f961a652d5ef885053;p=php

Fix 'clean' sections
---

diff --git a/ext/phar/tests/031.phpt b/ext/phar/tests/031.phpt
index 560d461129..4d5988621d 100755
--- a/ext/phar/tests/031.phpt
+++ b/ext/phar/tests/031.phpt
@@ -22,7 +22,7 @@ require $pname;
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/032.phpt b/ext/phar/tests/032.phpt
index f41f88203b..faf3dcbf58 100755
--- a/ext/phar/tests/032.phpt
+++ b/ext/phar/tests/032.phpt
@@ -21,7 +21,7 @@ echo $e->getMessage();
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt
index b04ec4f4c1..616b2ec0ac 100755
--- a/ext/phar/tests/phar_oo_001.phpt
+++ b/ext/phar/tests/phar_oo_001.phpt
@@ -35,7 +35,7 @@ catch (BadMethodCallException $e)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/phar_oo_003.phpt b/ext/phar/tests/phar_oo_003.phpt
index d9d1061415..9d24b1919b 100755
--- a/ext/phar/tests/phar_oo_003.phpt
+++ b/ext/phar/tests/phar_oo_003.phpt
@@ -27,7 +27,7 @@ foreach($phar as $name => $ent)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt
index b2ad79bb4e..acd647bf5a 100755
--- a/ext/phar/tests/phar_oo_004.phpt
+++ b/ext/phar/tests/phar_oo_004.phpt
@@ -75,7 +75,7 @@ foreach($it as $name => $ent)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt
index 89cf108afa..687cf59d07 100755
--- a/ext/phar/tests/phar_oo_005.phpt
+++ b/ext/phar/tests/phar_oo_005.phpt
@@ -28,7 +28,7 @@ foreach($it as $name => $ent)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt
index 5619663b3e..556c98ce0b 100755
--- a/ext/phar/tests/phar_oo_006.phpt
+++ b/ext/phar/tests/phar_oo_006.phpt
@@ -38,7 +38,7 @@ echo $phar['b.php']->getFilename() . "\n";
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt
index 45255b5677..80d1ece0ca 100755
--- a/ext/phar/tests/phar_oo_008.phpt
+++ b/ext/phar/tests/phar_oo_008.phpt
@@ -83,7 +83,7 @@ foreach($v as $k => $d)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/phar_oo_009.phpt b/ext/phar/tests/phar_oo_009.phpt
index 2528ec9f83..6abd03ee30 100755
--- a/ext/phar/tests/phar_oo_009.phpt
+++ b/ext/phar/tests/phar_oo_009.phpt
@@ -36,7 +36,7 @@ foreach($f as $k => $v)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt
index d9477e66c8..4e4435a7bb 100755
--- a/ext/phar/tests/phar_oo_010.phpt
+++ b/ext/phar/tests/phar_oo_010.phpt
@@ -36,7 +36,7 @@ var_dump(isset($phar['b']));
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/phar_oo_011.phpt b/ext/phar/tests/phar_oo_011.phpt
index d7ff82e761..236009b7e4 100644
--- a/ext/phar/tests/phar_oo_011.phpt
+++ b/ext/phar/tests/phar_oo_011.phpt
@@ -25,7 +25,7 @@ echo "\n";
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt
index f8c8d2d080..37a0e570a5 100755
--- a/ext/phar/tests/phar_oo_011b.phpt
+++ b/ext/phar/tests/phar_oo_011b.phpt
@@ -31,7 +31,7 @@ catch (BadMethodCallException $e)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/phar_oo_012.phpt b/ext/phar/tests/phar_oo_012.phpt
index 1bde922593..e79ac0960e 100644
--- a/ext/phar/tests/phar_oo_012.phpt
+++ b/ext/phar/tests/phar_oo_012.phpt
@@ -27,7 +27,7 @@ var_dump(isset($phar['f.php']));
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/phar_oo_012_confirm.phpt b/ext/phar/tests/phar_oo_012_confirm.phpt
index be70ca5599..58a3be87b3 100644
--- a/ext/phar/tests/phar_oo_012_confirm.phpt
+++ b/ext/phar/tests/phar_oo_012_confirm.phpt
@@ -30,7 +30,7 @@ var_dump(isset($phar['f.php']));
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt
index 669cbea420..01cf776986 100755
--- a/ext/phar/tests/phar_oo_012b.phpt
+++ b/ext/phar/tests/phar_oo_012b.phpt
@@ -34,7 +34,7 @@ catch (BadMethodCallException $e)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/phar_oo_nosig.phpt b/ext/phar/tests/phar_oo_nosig.phpt
index fe4544b13f..d99222e12c 100644
--- a/ext/phar/tests/phar_oo_nosig.phpt
+++ b/ext/phar/tests/phar_oo_nosig.phpt
@@ -16,7 +16,7 @@ var_dump($phar->getSignature());
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt
index fa4b96ebf1..a30e55b3cf 100644
--- a/ext/phar/tests/tar/tar_nostub.phpt
+++ b/ext/phar/tests/tar/tar_nostub.phpt
@@ -24,7 +24,7 @@ var_dump($phar->getStub());
 ===DONE===
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . '/tar_004.phar');
+@unlink(dirname(__FILE__) . '/tar_004.phar.tar');
 ?>
 --EXPECTF--
 string(0) ""