com php-src: fixed tests in ext/fileinfo: ext/fileinfo/tests/bug61964.phpt ext/fileinfo/tests/finfo_buffer_basic.phpt ext/fileinfo
/tests/finfo_buffer_variation1.phpt
| From: | Anatol Belski | Date: | Wed, 19 Feb 2014 09:04:29 +0000 |
| Subject: | com php-src: fixed tests in ext/fileinfo: ext/fileinfo/tests/bug61964.phpt ext/fileinfo/tests/finfo_buffer_basic.phpt ext/fileinfo /tests/finfo_buffer_variation1.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76112@lists.php.net to get a copy of this message | ||
Commit: 4019531748aa438f896948231deba4a0764c453b
Author: Anatol Belski <ab@php.net> Wed, 19 Feb 2014 10:04:29 +0100
Parents: 967a6771d35791a1a094efbf61ff89c58e874d7f
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4019531748aa438f896948231deba4a0764c453b
Log:
fixed tests in ext/fileinfo
Changed paths:
M ext/fileinfo/tests/bug61964.phpt
M ext/fileinfo/tests/finfo_buffer_basic.phpt
M ext/fileinfo/tests/finfo_buffer_variation1.phpt
Diff:
diff --git a/ext/fileinfo/tests/bug61964.phpt b/ext/fileinfo/tests/bug61964.phpt
index 99c8fd2..efb0b2c 100644
--- a/ext/fileinfo/tests/bug61964.phpt
+++ b/ext/fileinfo/tests/bug61964.phpt
@@ -56,6 +56,10 @@ Notice: finfo_open(): Warning: offset ` Core' invalid in %sbug61964.php on
line
Notice: finfo_open(): Warning: type `Core' invalid in %sbug61964.php on line %d
+Notice: finfo_open(): Warning: offset ` Me' invalid in %sbug61964.php on line %d
+
+Notice: finfo_open(): Warning: type `Me' invalid in %sbug61964.php on line %d
+
Notice: finfo_open(): Warning: offset `a' invalid in %sbug61964.php on line %d
Notice: finfo_open(): Warning: type `a' invalid in %sbug61964.php on line %d
diff --git a/ext/fileinfo/tests/finfo_buffer_basic.phpt b/ext/fileinfo/tests/finfo_buffer_basic.phpt
index 0c3c641..d8dcfab 100644
--- a/ext/fileinfo/tests/finfo_buffer_basic.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_basic.phpt
@@ -48,7 +48,7 @@ string(15) "MIFF image data"
string(25) "RIFF (little-endian) data"
string(28) "text/plain; charset=us-ascii"
string(26) "text/plain; charset=ebcdic"
-string(40) "application/octet-stream; charset=binary"
+string(22) "binary; charset=binary"
string(28) "text/plain; charset=us-ascii"
string(28) "text/plain; charset=us-ascii"
string(25) "text/plain; charset=utf-8"
diff --git a/ext/fileinfo/tests/finfo_buffer_variation1.phpt
b/ext/fileinfo/tests/finfo_buffer_variation1.phpt
index 4fdd2be..d9c9be0 100644
--- a/ext/fileinfo/tests/finfo_buffer_variation1.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_variation1.phpt
@@ -47,7 +47,7 @@ string(15) "MIFF image data"
string(25) "RIFF (little-endian) data"
string(28) "text/plain; charset=us-ascii"
string(26) "text/plain; charset=ebcdic"
-string(40) "application/octet-stream; charset=binary"
+string(22) "binary; charset=binary"
string(28) "text/plain; charset=us-ascii"
string(28) "text/plain; charset=us-ascii"
string(25) "text/plain; charset=utf-8"