From 6a50a8640c562a41d90c7ab46affa767b97d2621 Mon Sep 17 00:00:00 2001 From: Anatoliy Belsky Date: Thu, 27 Sep 2012 19:52:34 +0200 Subject: [PATCH] fix unix/win dir separators --- ...ecursiveDirectoryIterator_getSubPath_basic.phpt | 8 ++++---- ...siveDirectoryIterator_getSubPathname_basic.phpt | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt index 5107cd32b6f..a4b0073d564 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 4e17ea9d427..5c294a93adb 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==