com php-src: remove dup of the binary file, rely on a test runtime copy instead: "ext/fileinfo/tests/67647\347\ 247\201\343\201\257\3
43\202\254\343\203\25 1\343\202\271\343\202 \222\351\243\237\343\ 201\271\343\202\211\3 43\202\214\343\201\27 6\343\201\231.mov" ext/fileinfo
/tests/bug67647-mb.phpt
| From: | Anatol Belski | Date: | Sun, 30 Jul 2017 15:51:27 +0000 |
| Subject: | com php-src: remove dup of the binary file, rely on a test runtime copy instead: "ext/fileinfo/tests/67647\347\ 247\201\343\201\257\3 43\202\254\343\203\25 1\343\202\271\343\202 \222\351\243\237\343\ 201\271\343\202\211\3 43\202\214\343\201\27 6\343\201\231.mov" ext/fileinfo /tests/bug67647-mb.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98872@lists.php.net to get a copy of this message | ||
Commit: eab66f906836b52a10abe942cd1c8b08f118c3f9
Author: Anatol Belski <ab@php.net> Sun, 30 Jul 2017 17:51:27 +0200
Parents: 2d6d1ec55b553df786e6ae1216ed6edd4aba2072
Branches: PHP-7.1 PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eab66f906836b52a10abe942cd1c8b08f118c3f9
Log:
remove dup of the binary file, rely on a test runtime copy instead
Changed paths:
D
"ext/fileinfo/tests/67647\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.mov"
M ext/fileinfo/tests/bug67647-mb.phpt
Diff:
diff --git
"a/ext/fileinfo/tests/67647\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.mov"
"b/ext/fileinfo/tests/67647\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.mov"
deleted file mode 100644
index e119013..0000000
Binary files
"a/ext/fileinfo/tests/67647\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.mov"
and /dev/null differ
diff --git a/ext/fileinfo/tests/bug67647-mb.phpt b/ext/fileinfo/tests/bug67647-mb.phpt
index 611c4ab..b8c82db 100644
--- a/ext/fileinfo/tests/bug67647-mb.phpt
+++ b/ext/fileinfo/tests/bug67647-mb.phpt
@@ -1,16 +1,38 @@
--TEST--
Bug #67647: Bundled libmagic 5.17 does not detect quicktime files correctly
--SKIPIF--
-<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
+<?php
+ require_once(dirname(__FILE__) . '/skipif.inc');
+
+ if (ini_get("default_charset") != "UTF-8") {
+ die("skip require default_charset == UTF-8");
+ }
+?>
--FILE--
<?php
-$f = dirname(__FILE__) .. DIRECTORY_SEPARATOR .
"67647私はガラスを食べられます.mov";
+$src = dirname(__FILE__) . DIRECTORY_SEPARATOR . "67647.mov";
+
+$f_base = "67647私はガラスを食べられます.mov";
+$f = dirname(__FILE__) . DIRECTORY_SEPARATOR . $f_base;
+
+/* Streams mb path support is tested a lot elsewhere. Copy the existing file
+ therefore, avoid duplication in the repo. */
+if (!copy($src, $f) || empty(glob($f))) {
+ die("failed to copy '$src' to '$f'");
+}
$fi = new finfo(FILEINFO_MIME_TYPE);
var_dump($fi->file($f));
+
?>
+++DONE+++
+--CLEAN--
+<?php
+ $f_base = "67647私はガラスを食べられます.mov";
+ $f = dirname(__FILE__) . DIRECTORY_SEPARATOR . $f_base;
+ unlink($f);
+?>
--EXPECT--
string(15) "video/quicktime"
+++DONE+++