MFH: Test updates

diff --git a/ext/exif/tests/exif001.phpt b/ext/exif/tests/exif001.phpt
index 99771c8c0d4fb90c08efe0579e87cef9eada2b5e..8fac4286ca686d00170c78b10cc4328e2455d037 100644 (file)
--- a/ext/exif/tests/exif001.phpt
+++ b/ext/exif/tests/exif001.phpt
@@ -2,6 +2,9 @@
 Check for exif_read_data
 --SKIPIF--
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
+--INI--
+output_handler=
+zlib.output_compression=0
 --FILE--
 <?php
 /*
@@ -9,7 +12,7 @@ Check for exif_read_data
   test2.jpg is the same image but contains Exif/Comment information and a
             copy of test1.jpg as a thumbnail.
 */
-var_dump(exif_read_data('./ext/exif/tests/test2.jpg','',true,false));
+var_dump(exif_read_data(dirname(__FILE__).'/test2.jpg','',true,false));
 ?>
 --EXPECTF--
 array(5) {

diff --git a/ext/exif/tests/exif003.phpt b/ext/exif/tests/exif003.phpt
index 310fdf5f5bc88217b0580885d6739dcb651260ba..d61864e90983cbf2d674608f84714bc3769942cc 100644 (file)
--- a/ext/exif/tests/exif003.phpt
+++ b/ext/exif/tests/exif003.phpt
@@ -1,10 +1,13 @@
 --TEST--
 Check for exif_read_data, Unicode user comment
 --SKIPIF--
-<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
+<?php 
+       if (!extension_loaded('exif')) die('skip exif extension not available');
+       if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+?>
 --INI--
-output_handler = 
-zlib.output_compression = Off
+output_handler=
+zlib.output_compression=0
 exif.decode_unicode_motorola=UCS-2BE
 exif.encode_unicode=ISO-8859-15
 --FILE--

diff --git a/ext/exif/tests/exif004.phpt b/ext/exif/tests/exif004.phpt
index f69890bd1a9d6ca5bd599098f227ba43716f58ee..7cf69e3513b82285e6e485be62a8fac363ae7abb 100644 (file)
--- a/ext/exif/tests/exif004.phpt
+++ b/ext/exif/tests/exif004.phpt
@@ -6,8 +6,8 @@ Check for exif_read_data, Unicode WinXP tags
        if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
 ?>
 --INI--
-output_handler = 
-zlib.output_compression = Off
+output_handler=
+zlib.output_compression=0
 exif.decode_unicode_intel=UCS-2LE
 exif.decode_unicode_motorola=UCS-2BE
 exif.encode_unicode=ISO-8859-1

diff --git a/ext/exif/tests/exif005.phpt b/ext/exif/tests/exif005.phpt
index 02c34ea3dae21f2f24963e0482e54a28d38f8eee..6bd6264a1f074a1d4e561cca3140c4401b6388b6 100644 (file)
--- a/ext/exif/tests/exif005.phpt
+++ b/ext/exif/tests/exif005.phpt
@@ -1,9 +1,10 @@
 --TEST--
 Check for exif_read_data, unusual IFD start
 --SKIPIF--
-<?php 
-       if (!extension_loaded('exif')) print 'skip exif extension not available';
-?>
+<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
+--INI--
+output_handler=
+zlib.output_compression=0
 --FILE--
 <?php
 /* Do not change this test it is a REATME.TESTING example.