From: Greg Beaver <cellog@php.net>
Date: Fri, 14 Dec 2007 05:22:53 +0000 (+0000)
Subject: fix test
X-Git-Tag: RELEASE_2_0_0a1~1177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16c8adf0c15ed0d7edecfabc14b1208f1d053701;p=php

fix test
---

diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt
index 7dc7913ccd..6b6c1eece8 100755
--- a/ext/phar/tests/027.phpt
+++ b/ext/phar/tests/027.phpt
@@ -11,10 +11,10 @@ $pname = 'phar://' . $fname;
 $file = "<?php __HALT_COMPILER(); ?>";
 
 $files = array();
-$files['a.php']   = '<?php echo "This is a\n"; require "'.$pname.'/b.php"; ?>';      
-$files['b.php']   = '<?php echo "This is b\n"; require "'.$pname.'/b/c.php"; ?>';    
-$files['b/c.php'] = '<?php echo "This is b/c\n"; require "'.$pname.'/b/d.php"; ?>';  
-$files['b/d.php'] = '<?php echo "This is b/d\n"; require "'.$pname.'/e.php"; ?>';    
+$files['a.php']   = '<?php echo "This is a\n"; require \''.$pname.'/b.php\'; ?>';      
+$files['b.php']   = '<?php echo "This is b\n"; require \''.$pname.'/b/c.php\'; ?>';    
+$files['b/c.php'] = '<?php echo "This is b/c\n"; require \''.$pname.'/b/d.php\'; ?>';  
+$files['b/d.php'] = '<?php echo "This is b/d\n"; require \''.$pname.'/e.php\'; ?>';    
 $files['e.php']   = '<?php echo "This is e\n"; ?>';                                  
 
 include 'phar_test.inc';
diff --git a/ext/phar/tests/030.phpt b/ext/phar/tests/030.phpt
index f8f9c12a26..cd0a41b311 100755
--- a/ext/phar/tests/030.phpt
+++ b/ext/phar/tests/030.phpt
@@ -11,10 +11,10 @@ $pname = 'phar://' . $fname;
 $file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>';
 
 $files = array();
-$files['a.php']   = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>';      
-$files['b.php']   = '<?php echo "This is b\n"; include "'.$pname.'/b/c.php"; ?>';    
-$files['b/c.php'] = '<?php echo "This is b/c\n"; include "'.$pname.'/b/d.php"; ?>';  
-$files['b/d.php'] = '<?php echo "This is b/d\n"; include "'.$pname.'/e.php"; ?>';    
+$files['a.php']   = '<?php echo "This is a\n"; include \''.$pname.'/b.php\'; ?>';      
+$files['b.php']   = '<?php echo "This is b\n"; include \''.$pname.'/b/c.php\'; ?>';    
+$files['b/c.php'] = '<?php echo "This is b/c\n"; include \''.$pname.'/b/d.php\'; ?>';  
+$files['b/d.php'] = '<?php echo "This is b/d\n"; include \''.$pname.'/e.php\'; ?>';    
 $files['e.php']   = '<?php echo "This is e\n"; ?>';                                  
 
 include 'phar_test.inc';
diff --git a/ext/phar/tests/031.phpt b/ext/phar/tests/031.phpt
index 94c14d5194..67efe85622 100755
--- a/ext/phar/tests/031.phpt
+++ b/ext/phar/tests/031.phpt
@@ -28,4 +28,4 @@ __halt_compiler();
 --EXPECTF--
 string(25) "<?php echo new new class;"
 
-Parse error: %s error%sunexpected%s in phar://%sphar_oo_test.phar.php/a.php on line %d
+Parse error: %s error%s in phar://%sphar_oo_test.phar.php/a.php on line %d
diff --git a/ext/phar/tests/phar_buildfromiterator8.phpt b/ext/phar/tests/phar_buildfromiterator8.phpt
index a48b0404fb..7e9307ecc5 100644
--- a/ext/phar/tests/phar_buildfromiterator8.phpt
+++ b/ext/phar/tests/phar_buildfromiterator8.phpt
@@ -22,73 +22,73 @@ try {
 unlink(dirname(__FILE__) . '/buildfromiterator.phar');
 __HALT_COMPILER();
 ?>
---EXPECT--
+--EXPECTF--
 array(33) {
   ["001.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/001.phpt"
+  string(51) "%s001.phpt"
   ["002.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/002.phpt"
+  string(51) "%s002.phpt"
   ["003.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/003.phpt"
+  string(51) "%s003.phpt"
   ["004.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/004.phpt"
+  string(51) "%s004.phpt"
   ["005.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/005.phpt"
+  string(51) "%s005.phpt"
   ["006.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/006.phpt"
+  string(51) "%s006.phpt"
   ["007.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/007.phpt"
+  string(51) "%s007.phpt"
   ["008.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/008.phpt"
+  string(51) "%s008.phpt"
   ["009.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/009.phpt"
+  string(51) "%s009.phpt"
   ["010.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/010.phpt"
+  string(51) "%s010.phpt"
   ["011.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/011.phpt"
+  string(51) "%s011.phpt"
   ["012.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/012.phpt"
+  string(51) "%s012.phpt"
   ["013.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/013.phpt"
+  string(51) "%s013.phpt"
   ["014.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/014.phpt"
+  string(51) "%s014.phpt"
   ["015.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/015.phpt"
+  string(51) "%s015.phpt"
   ["016.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/016.phpt"
+  string(51) "%s016.phpt"
   ["017.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/017.phpt"
+  string(51) "%s017.phpt"
   ["018.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/018.phpt"
+  string(51) "%s018.phpt"
   ["019.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/019.phpt"
+  string(51) "%s019.phpt"
   ["020.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/020.phpt"
+  string(51) "%s020.phpt"
   ["021.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/021.phpt"
+  string(51) "%s021.phpt"
   ["022.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/022.phpt"
+  string(51) "%s022.phpt"
   ["023.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/023.phpt"
+  string(51) "%s023.phpt"
   ["024.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/024.phpt"
+  string(51) "%s024.phpt"
   ["025.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/025.phpt"
+  string(51) "%s025.phpt"
   ["026.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/026.phpt"
+  string(51) "%s026.phpt"
   ["027.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/027.phpt"
+  string(51) "%s027.phpt"
   ["028.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/028.phpt"
+  string(51) "%s028.phpt"
   ["029.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/029.phpt"
+  string(51) "%s029.phpt"
   ["030.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/030.phpt"
+  string(51) "%s030.phpt"
   ["031.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/031.phpt"
+  string(51) "%s031.phpt"
   ["032.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/032.phpt"
+  string(51) "%s032.phpt"
   ["033.phpt"]=>
-  string(51) "/home/cellog/workspace/php5/ext/phar/tests/033.phpt"
+  string(51) "%s033.phpt"
 }
 ===DONE===
diff --git a/ext/phar/tests/phar_dir_iterate.phpt b/ext/phar/tests/phar_dir_iterate.phpt
index a0a283a862..9bc125a054 100644
--- a/ext/phar/tests/phar_dir_iterate.phpt
+++ b/ext/phar/tests/phar_dir_iterate.phpt
@@ -25,7 +25,7 @@ unlink(dirname(__FILE__) . '/test.phar');
 __halt_compiler();
 ?>
 --EXPECTF--
-string(%d) "phar://%stest.phar/another.file.txt"
-string(%d) "phar://%stest.phar/sub/top.txt"
-string(%d) "phar://%stest.phar/top.txt"
+string(%d) "phar://%stest.phar%canother.file.txt"
+string(%d) "phar://%stest.phar%csub%ctop.txt"
+string(%d) "phar://%stest.phar%ctop.txt"
 ===DONE===
diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt
index 080df2c61a..18c5f69e43 100755
--- a/ext/phar/tests/phar_oo_002.phpt
+++ b/ext/phar/tests/phar_oo_002.phpt
@@ -36,7 +36,7 @@ $phar = new Phar($fname);
 foreach(new RecursiveIteratorIterator($phar) as $name => $ent)
 {
 	var_dump(str_replace(dirname(__FILE__), '*', $name));
-	var_dump($ent->getFilename());
+	var_dump(str_replace('\\', '/', $ent->getFilename()));
 	var_dump($ent->getCompressedSize());
 	var_dump($ent->isCRCChecked());
 	var_dump($ent->isCRCChecked() ? $ent->getCRC32() : NULL);
diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt
index c3d0c29bb2..4c3d3a1e97 100755
--- a/ext/phar/tests/phar_oo_005.phpt
+++ b/ext/phar/tests/phar_oo_005.phpt
@@ -15,8 +15,8 @@ $it = new RecursiveIteratorIterator($it);
 
 foreach($it as $name => $ent)
 {
-	var_dump(str_replace($fname, '*', $name));
-	var_dump(str_replace($fname, '*', $ent->getPathname()));
+	var_dump(str_replace(array('\\', $fname), array('/', '*'), $name));
+	var_dump(str_replace(array('\\', $fname), array('/', '*'), $ent->getPathname()));
 	var_dump($it->getSubPath());
 	var_dump($it->getSubPathName());
 	$sub = $it->getPathInfo();
diff --git a/ext/phar/tests/phar_oo_007.phpt b/ext/phar/tests/phar_oo_007.phpt
index d294cd043f..4a3acb5b32 100755
--- a/ext/phar/tests/phar_oo_007.phpt
+++ b/ext/phar/tests/phar_oo_007.phpt
@@ -14,7 +14,7 @@ class MyFile extends SplFileObject
 {
 	function __construct($name)
 	{
-		echo __METHOD__ . "(" . str_replace(dirname(__FILE__), '*', $name) . ")\n";
+		echo __METHOD__ . "(" . str_replace(str_replace('\\', '/', dirname(__FILE__)), '*', $name) . ")\n";
 		parent::__construct($name);
 	}
 }