From 991116a03b978abdd8bb73b5d3e68d59356435e3 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 19 Jul 2016 14:45:23 +0200 Subject: fix test portability and expectation The test images for #72603 and #72618 are broken, that seems to be the cause of different test output. Seems also to be platform dependent, so it's not reliable to depend on the exact error output. --- ext/exif/tests/bug62523_2.phpt | 2 +- ext/exif/tests/bug72603.phpt | 4 ++-- ext/exif/tests/bug72618.phpt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/exif/tests/bug62523_2.phpt b/ext/exif/tests/bug62523_2.phpt index c533d42652..689ed0679d 100644 --- a/ext/exif/tests/bug62523_2.phpt +++ b/ext/exif/tests/bug62523_2.phpt @@ -13,6 +13,6 @@ Done --EXPECTF-- Test -Warning: exif_read_data(bug62523_2.jpg): IFD data bad offset: 0xADB23672 length 0x0D94 in %s/bug62523_2.php on line %d +Warning: exif_read_data(bug62523_2.jpg): IFD data bad offset: 0xADB23672 length 0x0D94 in %s%ebug62523_2.php on line %d int(30) Done diff --git a/ext/exif/tests/bug72603.phpt b/ext/exif/tests/bug72603.phpt index a4295f9848..71d3943446 100644 --- a/ext/exif/tests/bug72603.phpt +++ b/ext/exif/tests/bug72603.phpt @@ -7,5 +7,5 @@ Bug #72603 (Out of bound read in exif_process_IFD_in_MAKERNOTE) var_dump(count(exif_read_data(dirname(__FILE__) . "/bug72603.jpeg"))); ?> --EXPECTF-- -Warning: exif_read_data(bug72603.jpeg): IFD data bad offset: 0x058C length 0x001C in %s/bug72603.php on line %d -int(13) \ No newline at end of file +Warning: exif_read_data(bug72603.jpeg): %s in %s%ebug72603.php on line %d +int(%d) diff --git a/ext/exif/tests/bug72618.phpt b/ext/exif/tests/bug72618.phpt index 424c0ec402..c4fe8e3f90 100644 --- a/ext/exif/tests/bug72618.phpt +++ b/ext/exif/tests/bug72618.phpt @@ -7,5 +7,5 @@ Bug 72618 (NULL Pointer Dereference in exif_process_user_comment) var_dump(count(exif_read_data(dirname(__FILE__) . "/bug72618.jpg"))); ?> --EXPECTF-- -Warning: exif_read_data(bug72618.jpg): IFD data bad offset: 0x058E length 0x0030 in %s/bug72618.php on line %d -int(13) \ No newline at end of file +Warning: exif_read_data(bug72618.jpg): %s in %s%ebug72618.php on line %d +int(%d) -- cgit v1.2.1