New naming scheme

diff --git a/ext/exif/tests/001.phpt b/ext/exif/tests/exif001.phpt
similarity index 95%
rename from ext/exif/tests/001.phpt
rename to ext/exif/tests/exif001.phpt
index a66fc5ff52c3f91c07f91cfc2cd0a7ec3787e9e9..99771c8c0d4fb90c08efe0579e87cef9eada2b5e 100644 (file)
--- a/ext/exif/tests/001.phpt
+++ b/ext/exif/tests/exif001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for exif_read_data
 --SKIPIF--
-<?php if (!extension_loaded("exif")) print "skip";?>
+<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
 <?php
 /*

diff --git a/ext/exif/tests/002.phpt b/ext/exif/tests/exif002.phpt
similarity index 88%
rename from ext/exif/tests/002.phpt
rename to ext/exif/tests/exif002.phpt
index 18185cf95ce97f8ce386e0be7ac7029c3a32f6ab..29b7791503fec04a192c5a0a40eed8b1f0415718 100644 (file)
--- a/ext/exif/tests/002.phpt
+++ b/ext/exif/tests/exif002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for exif_thumbnail
 --SKIPIF--
-<?php if (!extension_loaded("exif")) print "skip";?>
+<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --INI--
 magic_quotes_runtime=0
 output_handler=

diff --git a/ext/exif/tests/003.phpt b/ext/exif/tests/exif003.phpt
similarity index 95%
rename from ext/exif/tests/003.phpt
rename to ext/exif/tests/exif003.phpt
index 79eded29f2df9126afec68601255fd6735789190..310fdf5f5bc88217b0580885d6739dcb651260ba 100644 (file)
--- a/ext/exif/tests/003.phpt
+++ b/ext/exif/tests/exif003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for exif_read_data, Unicode user comment
 --SKIPIF--
-<?php if (!extension_loaded("exif") || !extension_loaded("mbstring")) print "skip";?>
+<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --INI--
 output_handler = 
 zlib.output_compression = Off

diff --git a/ext/exif/tests/004.phpt b/ext/exif/tests/exif004.phpt
similarity index 80%
rename from ext/exif/tests/004.phpt
rename to ext/exif/tests/exif004.phpt
index d8cda1ab0c889e02725b880fc85ec8a91612b71c..f69890bd1a9d6ca5bd599098f227ba43716f58ee 100644 (file)
--- a/ext/exif/tests/004.phpt
+++ b/ext/exif/tests/exif004.phpt
@@ -1,7 +1,10 @@
 --TEST--
 Check for exif_read_data, Unicode WinXP tags   
 --SKIPIF--
-<?php if (!extension_loaded("exif") || !extension_loaded("mbstring")) print "skip";?>
+<?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

diff --git a/ext/exif/tests/005.phpt b/ext/exif/tests/exif005.phpt
similarity index 82%
rename from ext/exif/tests/005.phpt
rename to ext/exif/tests/exif005.phpt
index d3c50c381534aa4c4f658c17604a59ad88d81b22..58abac9620d732865ce405b48371c4625cc302eb 100644 (file)
--- a/ext/exif/tests/005.phpt
+++ b/ext/exif/tests/exif005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for exif_read_data, unusual IFD start
 --SKIPIF--
-<?php if (!extension_loaded("exif")) print "skip";?>
+<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
 <?php
 /*