diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-06-24 01:42:22 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-06-24 01:42:22 +0200 |
| commit | c201b638734c720e58ca89226f335e287bb9517f (patch) | |
| tree | 74cd2dbf7f6722c3a50e10d7c66f26cbf520ba58 | |
| parent | e181931f77c5815f4a9bacbbef9af8008aea6b1f (diff) | |
| parent | cd068b1ed6fda019e211cdd87a55a0b336669a92 (diff) | |
| download | php-git-c201b638734c720e58ca89226f335e287bb9517f.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Made bug44295-win.phpt locale independent
| -rw-r--r-- | ext/standard/tests/general_functions/bug44295-win.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/tests/general_functions/bug44295-win.phpt b/ext/standard/tests/general_functions/bug44295-win.phpt index d210a54d51..222b7beda7 100644 --- a/ext/standard/tests/general_functions/bug44295-win.phpt +++ b/ext/standard/tests/general_functions/bug44295-win.phpt @@ -23,7 +23,7 @@ try { ?> ==DONE== <?php exit(0); ?> ---EXPECT-- +--EXPECTF-- before -in catch: DirectoryIterator::__construct(c:\not\exists\here,c:\not\exists\here): The system cannot find the path specified. (code: 3) +in catch: DirectoryIterator::__construct(c:\not\exists\here,c:\not\exists\here): %s (code: 3) ==DONE== |