Commit:    6a50a8640c562a41d90c7ab46affa767b97d2621
Author:    Anatoliy Belsky <a...@php.net>         Thu, 27 Sep 2012 19:52:34 
+0200
Parents:   592b232e834ed2698fa97ad4dd58e5ab21f257be
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=6a50a8640c562a41d90c7ab46affa767b97d2621

Log:
fix unix/win dir separators

Changed paths:
  M  ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt
  M  ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt


Diff:
diff --git a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt 
b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt
index 5107cd3..a4b0073 100644
--- a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt
+++ b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt
@@ -43,10 +43,10 @@ function rrmdir($dir) {
        rrmdir($targetDir);
 ?>
 
---EXPECT--
+--EXPECTF--
 a0c967a6c2c34786e4802f59af9356f5
 a0c967a6c2c34786e4802f59af9356f5
-a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507
-a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507
-a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507
+a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507
+a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507
+a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507
 ==DONE==
diff --git a/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt 
b/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt
index 4e17ea9..5c294a9 100644
--- a/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt
+++ b/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt
@@ -44,15 +44,15 @@ function rrmdir($dir) {
 $targetDir = __DIR__ . DIRECTORY_SEPARATOR . 
md5('recursiveDirectoryIterator::getSubPathname');
 rrmdir($targetDir);
 ?>
---EXPECT--
+--EXPECTF--
 .
 .
 ..
-a0c967a6c2c34786e4802f59af9356f5/.
-a0c967a6c2c34786e4802f59af9356f5/..
-a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507/.
-a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507/..
-a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507/getSubPathname_test_2.tmp
-a0c967a6c2c34786e4802f59af9356f5/getSubPathname_test_3.tmp
+a0c967a6c2c34786e4802f59af9356f5%c.
+a0c967a6c2c34786e4802f59af9356f5%c..
+a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507%c.
+a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507%c..
+a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507%cgetSubPathname_test_2.tmp
+a0c967a6c2c34786e4802f59af9356f5%cgetSubPathname_test_3.tmp
 getSubPathname_test_1.tmp
 ==DONE==


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to