com php-src: Fix glob-wrapper.phpt to not fail in Windows: ext/standard/tests/streams/glob-wrapper.phpt
| From: | Nikita Popov | Date: | Tue, 10 Jan 2017 22:18:52 +0000 |
| Subject: | com php-src: Fix glob-wrapper.phpt to not fail in Windows: ext/standard/tests/streams/glob-wrapper.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96675@lists.php.net to get a copy of this message | ||
Commit: ad9c552b120b8f73a5e87b2f8af05e32db512e9f
Author: Mitch Hagstrand <mhagstrand@gmail.com> Tue, 10 Jan 2017 11:51:55 -0800
Committer: Nikita Popov <nikic@php.net> Tue, 10 Jan 2017 23:18:52 +0100
Parents: 7e49e8e7970b423968de7a53ea9a0796f4634276
Branches: PHP-5.6 PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ad9c552b120b8f73a5e87b2f8af05e32db512e9f
Log:
Fix glob-wrapper.phpt to not fail in Windows
Changed paths:
M ext/standard/tests/streams/glob-wrapper.phpt
Diff:
diff --git a/ext/standard/tests/streams/glob-wrapper.phpt
b/ext/standard/tests/streams/glob-wrapper.phpt
index fc47d83..0e4438f 100644
--- a/ext/standard/tests/streams/glob-wrapper.phpt
+++ b/ext/standard/tests/streams/glob-wrapper.phpt
@@ -23,13 +23,13 @@ foreach ( [ __DIR__, "glob://".__DIR__ ] as $spec) {
--EXPECTF--
** Opening %s
-Warning: opendir(): open_basedir restriction in effect. File(/%s) is not within the allowed
path(s): (/does_not_exist) in %s/glob-wrapper.php on line 5
+Warning: opendir(): open_basedir restriction in effect. File(%s) is not within the allowed path(s):
(/does_not_exist) in %s%eglob-wrapper.php on line 5
-Warning: opendir(/%s): failed to open dir: Operation not permitted in %s/glob-wrapper.php on line 5
-Failed to open /%s
+Warning: opendir(%s): failed to open dir: Operation not permitted in %s%eglob-wrapper.php on line 5
+Failed to open %s
** Opening glob://%s
-Warning: opendir(): open_basedir restriction in effect. File(/%s) is not within the allowed
path(s): (/does_not_exist) in %s/glob-wrapper.php on line 5
+Warning: opendir(): open_basedir restriction in effect. File(%s) is not within the allowed path(s):
(/does_not_exist) in %s%eglob-wrapper.php on line 5
-Warning: opendir(glob://%s): failed to open dir: operation failed in %s/glob-wrapper.php on line 5
+Warning: opendir(glob://%s): failed to open dir: operation failed in %s%eglob-wrapper.php on line 5
Failed to open glob://%s