From 15f9f20c3ca8ae2fd313bfcd36d9d479aac2eb1f Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Sat, 26 Apr 2008 17:32:18 +0000
Subject: [PATCH] really fix test by fixing the regex

---
 ext/phar/tests/phar_buildfromiterator10.phpt | 48 +-------------------
 1 file changed, 2 insertions(+), 46 deletions(-)

diff --git a/ext/phar/tests/phar_buildfromiterator10.phpt b/ext/phar/tests/phar_buildfromiterator10.phpt
index 2f70ccdc6b..71404f2222 100644
--- a/ext/phar/tests/phar_buildfromiterator10.phpt
+++ b/ext/phar/tests/phar_buildfromiterator10.phpt
@@ -12,7 +12,7 @@ try {
 	$phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar');
 	$dir = new RecursiveDirectoryIterator('.');
 	$iter = new RecursiveIteratorIterator($dir);
-	$a = $phar->buildFromIterator(new RegexIterator($iter, '/_\d{3}\.phpt/'), dirname(__FILE__) . DIRECTORY_SEPARATOR);
+	$a = $phar->buildFromIterator(new RegexIterator($iter, '/_\d{3}\.phpt$/'), dirname(__FILE__) . DIRECTORY_SEPARATOR);
 	asort($a);
 	var_dump($a);
 } catch (Exception $e) {
@@ -27,11 +27,9 @@ unlink(dirname(__FILE__) . '/buildfromiterator.phar');
 __HALT_COMPILER();
 ?>
 --EXPECTF--
-array(56) {
+array(34) {
   ["extracted_001.phpt"]=>
   string(%d) "%sextracted_001.phpt"
-  ["extracted_001.phpt~"]=>
-  string(%d) "%sextracted_001.phpt~"
   ["phar_ctx_001.phpt"]=>
   string(%d) "%sphar_ctx_001.phpt"
   ["phar_get_supported_signatures_001.phpt"]=>
@@ -40,26 +38,18 @@ array(56) {
   string(%d) "%sphar_get_supported_signatures_002.phpt"
   ["phar_oo_001.phpt"]=>
   string(%d) "%sphar_oo_001.phpt"
-  ["phar_oo_001.phpt~"]=>
-  string(%d) "%sphar_oo_001.phpt~"
   ["phar_oo_002.phpt"]=>
   string(%d) "%sphar_oo_002.phpt"
-  ["phar_oo_002.phpt~"]=>
-  string(%d) "%sphar_oo_002.phpt~"
   ["phar_oo_003.phpt"]=>
   string(%d) "%sphar_oo_003.phpt"
   ["phar_oo_004.phpt"]=>
   string(%d) "%sphar_oo_004.phpt"
   ["phar_oo_005.phpt"]=>
   string(%d) "%sphar_oo_005.phpt"
-  ["phar_oo_005.phpt~"]=>
-  string(%d) "%sphar_oo_005.phpt~"
   ["phar_oo_006.phpt"]=>
   string(%d) "%sphar_oo_006.phpt"
   ["phar_oo_007.phpt"]=>
   string(%d) "%sphar_oo_007.phpt"
-  ["phar_oo_007.phpt~"]=>
-  string(%d) "%sphar_oo_007.phpt~"
   ["phar_oo_008.phpt"]=>
   string(%d) "%sphar_oo_008.phpt"
   ["phar_oo_009.phpt"]=>
@@ -72,73 +62,39 @@ array(56) {
   string(%d) "%sphar_oo_012.phpt"
   ["phar_oo_compressed_001.phpt"]=>
   string(%d) "%sphar_oo_compressed_001.phpt"
-  ["phar_oo_compressed_001.phpt~"]=>
-  string(%d) "%sphar_oo_compressed_001.phpt~"
   ["phar_oo_compressed_002.phpt"]=>
   string(%d) "%sphar_oo_compressed_002.phpt"
   ["phpinfo_001.phpt"]=>
   string(%d) "%sphpinfo_001.phpt"
-  ["phpinfo_001.phpt~"]=>
-  string(%d) "%sphpinfo_001.phpt~"
   ["phpinfo_002.phpt"]=>
   string(%d) "%sphpinfo_002.phpt"
-  ["phpinfo_002.phpt~"]=>
-  string(%d) "%sphpinfo_002.phpt~"
   ["phpinfo_003.phpt"]=>
   string(%d) "%sphpinfo_003.phpt"
-  ["phpinfo_003.phpt~"]=>
-  string(%d) "%sphpinfo_003.phpt~"
   ["phpinfo_004.phpt"]=>
   string(%d) "%sphpinfo_004.phpt"
-  ["phpinfo_004.phpt~"]=>
-  string(%d) "%sphpinfo_004.phpt~"
   ["tar/tar_001.phpt"]=>
   string(%d) "%star%ctar_001.phpt"
-  ["tar/tar_001.phpt~"]=>
-  string(%d) "%star%ctar_001.phpt~"
   ["tar/tar_002.phpt"]=>
   string(%d) "%star%ctar_002.phpt"
-  ["tar/tar_002.phpt~"]=>
-  string(%d) "%star%ctar_002.phpt~"
   ["tar/tar_003.phpt"]=>
   string(%d) "%star%ctar_003.phpt"
   ["tar/tar_004.phpt"]=>
   string(%d) "%star%ctar_004.phpt"
-  ["tar/tar_004.phpt~"]=>
-  string(%d) "%star%ctar_004.phpt~"
   ["zip/corrupt_001.phpt"]=>
   string(%d) "%szip%ccorrupt_001.phpt"
-  ["zip/corrupt_001.phpt~"]=>
-  string(%d) "%szip%ccorrupt_001.phpt~"
   ["zip/corrupt_002.phpt"]=>
   string(%d) "%szip%ccorrupt_002.phpt"
-  ["zip/corrupt_002.phpt~"]=>
-  string(%d) "%szip%ccorrupt_002.phpt~"
   ["zip/corrupt_003.phpt"]=>
   string(%d) "%szip%ccorrupt_003.phpt"
-  ["zip/corrupt_003.phpt~"]=>
-  string(%d) "%szip%ccorrupt_003.phpt~"
   ["zip/corrupt_004.phpt"]=>
   string(%d) "%szip%ccorrupt_004.phpt"
-  ["zip/corrupt_004.phpt~"]=>
-  string(%d) "%szip%ccorrupt_004.phpt~"
   ["zip/corrupt_005.phpt"]=>
   string(%d) "%szip%ccorrupt_005.phpt"
-  ["zip/corrupt_005.phpt~"]=>
-  string(%d) "%szip%ccorrupt_005.phpt~"
   ["zip/corrupt_006.phpt"]=>
   string(%d) "%szip%ccorrupt_006.phpt"
-  ["zip/corrupt_006.phpt~"]=>
-  string(%d) "%szip%ccorrupt_006.phpt~"
   ["zip/corrupt_007.phpt"]=>
   string(%d) "%szip%ccorrupt_007.phpt"
-  ["zip/corrupt_007.phpt~"]=>
-  string(%d) "%szip%ccorrupt_007.phpt~"
   ["zip/corrupt_008.phpt"]=>
   string(%d) "%szip%ccorrupt_008.phpt"
-  ["zip/corrupt_008.phpt~"]=>
-  string(%d) "%szip%ccorrupt_008.phpt~"
-  ["zip/tar_001.phpt~"]=>
-  string(%d) "%szip%ctar_001.phpt~"
 }
 ===DONE===
-- 
2.50.1