Adjusting tests to use EXPECTF (faster testing) and adjusting 5_2 version to lack...

diff --git a/ext/gd/tests/imagecolorallocate_variation3.phpt b/ext/gd/tests/imagecolorallocate_variation3.phpt
index 83aa246e636082cead1fb92c04043c3fefc702ee..1e0332fc8078a0477c9f62883600e518361aeb7e 100644 (file)
--- a/ext/gd/tests/imagecolorallocate_variation3.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation3.phpt
@@ -55,8 +55,8 @@ $values = array(
       // float data
       'float 10.5' => 10.5,
       'float -10.5' => -10.5,
-      'float 10.1234567e10' => 10.1234567e10,
-      'float 10.7654321E-10' => 10.7654321E-10,
+      'float 10.1234567e5' => 10.1234567e5,
+      'float 10.7654321E-5' => 10.7654321E-5,
       'float .5' => .5,
 
       // array data
@@ -105,110 +105,110 @@ foreach($values as $key => $value) {
 };
 ?>
 ===DONE===
---EXPECTREGEX--
-\*\*\* Testing imagecolorallocate\(\) : usage variations \*\*\*
+--EXPECTF--
+*** Testing imagecolorallocate() : usage variations ***
 
 --float 10.5--
-int\(657930\)
+int(657930)
 
 --float -10.5--
-int\(652810\)
+int(652810)
 
---float 10.1234567e10--
-int\(655114\)|int\(217143306\)
+--float 10.1234567e5--
+int(259815690)
 
---float 10.7654321E-10--
-int\(655370\)
+--float 10.7654321E-5--
+int(655370)
 
 --float .5--
-int\(655370\)
+int(655370)
 
 --empty array--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, array given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, array given in %s on line %d
 NULL
 
 --int indexed array--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, array given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, array given in %s on line %d
 NULL
 
 --associative array--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, array given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, array given in %s on line %d
 NULL
 
 --nested arrays--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, array given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, array given in %s on line %d
 NULL
 
 --uppercase NULL--
-int\(655370\)
+int(655370)
 
 --lowercase null--
-int\(655370\)
+int(655370)
 
 --lowercase true--
-int\(655626\)
+int(655626)
 
 --lowercase false--
-int\(655370\)
+int(655370)
 
 --uppercase TRUE--
-int\(655626\)
+int(655626)
 
 --uppercase FALSE--
-int\(655370\)
+int(655370)
 
 --empty string DQ--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string given in %s on line %d
 NULL
 
 --empty string SQ--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string given in %s on line %d
 NULL
 
 --string DQ--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string given in %s on line %d
 NULL
 
 --string SQ--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string given in %s on line %d
 NULL
 
 --mixed case string--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string given in %s on line %d
 NULL
 
 --heredoc--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string given in %s on line %d
 NULL
 
 --instance of classWithToString--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, object given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, object given in %s on line %d
 NULL
 
 --instance of classWithoutToString--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, object given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, object given in %s on line %d
 NULL
 
 --undefined var--
-int\(655370\)
+int(655370)
 
 --unset var--
-int\(655370\)
+int(655370)
 
 --file resource--
 
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, resource given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, resource given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file