com php-src: Fix exif test failure: ext/exif/tests/bug60150.phpt
| From: | Nikita Popov | Date: | Tue, 14 Aug 2012 15:33:38 +0000 |
| Subject: | com php-src: Fix exif test failure: ext/exif/tests/bug60150.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69829@lists.php.net to get a copy of this message | ||
Commit: e1c610fb44385cd2894be1957cc32f7cccc4b476
Author: Nikita Popov <nikic@php.net> Tue, 14 Aug 2012 17:33:38 +0200
Parents: da14cdd6f317c20a338a25ffd0ddaec0155cff3e
Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e1c610fb44385cd2894be1957cc32f7cccc4b476
Log:
Fix exif test failure
There are two slightly different error messages for invalid pointers, so
make the pattern slightly less strict to account for both.
Changed paths:
M ext/exif/tests/bug60150.phpt
Diff:
diff --git a/ext/exif/tests/bug60150.phpt b/ext/exif/tests/bug60150.phpt
index 63cf0a9..be01998 100755
--- a/ext/exif/tests/bug60150.phpt
+++ b/ext/exif/tests/bug60150.phpt
@@ -12,7 +12,7 @@ var_dump(exif_read_data($infile));
?>
===DONE===
--EXPECTF--
-Warning: exif_read_data(bug60150.jpg): Process tag(x9003=DateTimeOri): Illegal pointer offset(x%x +
x%x = x%x > x%x) in %s on line %d
+Warning: exif_read_data(bug60150.jpg): Process tag(x9003=DateTimeOri): Illegal pointer offset(%s)
in %s on line %d
Warning: exif_read_data(bug60150.jpg): Error reading from file: got=x%x(=%d) != itemlen-%d=x%x(=%d)
in %s on line %d