com php-src: Fix tests: ext/exif/tests/bug54002.phpt ext/exif/tests/bug62523_2.phpt
| From: | Stanislav Malyshev | Date: | Tue, 19 Jul 2016 06:30:51 +0000 |
| Subject: | com php-src: Fix tests: ext/exif/tests/bug54002.phpt ext/exif/tests/bug62523_2.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93095@lists.php.net to get a copy of this message | ||
Commit: 1364742be9757e594fd1b203d45805106ecd31c7
Author: Stanislav Malyshev <stas@php.net> Mon, 18 Jul 2016 23:30:51 -0700
Parents: 41131cd41d2fd2e0c2f332a27988df75659c42e4
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1364742be9757e594fd1b203d45805106ecd31c7
Log:
Fix tests
Changed paths:
M ext/exif/tests/bug54002.phpt
M ext/exif/tests/bug62523_2.phpt
Diff:
diff --git a/ext/exif/tests/bug54002.phpt b/ext/exif/tests/bug54002.phpt
index c51fa58..8f85339 100644
--- a/ext/exif/tests/bug54002.phpt
+++ b/ext/exif/tests/bug54002.phpt
@@ -13,8 +13,4 @@ exif_read_data(__DIR__ . '/bug54002_2.jpeg');
--EXPECTF--
Warning: exif_read_data(bug54002_1.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in
%sbug54002.php on line %d
-Warning: exif_read_data(bug54002_1.jpeg): Process tag(xA000=FlashPixVer): Illegal pointer
offset(%s) in %sbug54002.php on line %d
-
-Warning: exif_read_data(bug54002_2.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in
%sbug54002.php on line %d
-
-Warning: exif_read_data(bug54002_2.jpeg): Process tag(xA000=FlashPixVer): Illegal pointer
offset(%s) in %sbug54002.php on line %d
+Warning: exif_read_data(bug54002_2.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in
%sbug54002.php on line %d
\ No newline at end of file
diff --git a/ext/exif/tests/bug62523_2.phpt b/ext/exif/tests/bug62523_2.phpt
index ddc8ae8..c533d42 100644
--- a/ext/exif/tests/bug62523_2.phpt
+++ b/ext/exif/tests/bug62523_2.phpt
@@ -10,7 +10,9 @@ echo "Test\n";
var_dump(count(exif_read_data(__DIR__."/bug62523_2.jpg")));
?>
Done
---EXPECT--
+--EXPECTF--
Test
-int(76)
+
+Warning: exif_read_data(bug62523_2.jpg): IFD data bad offset: 0xADB23672 length 0x0D94 in
%s/bug62523_2.php on line %d
+int(30)
Done