fix tests

diff --git a/ext/gd/tests/bug44849.phpt b/ext/gd/tests/bug44849.phpt
index 2f4f475f753c34a9eb2124c228100e42090260fd..a6d162c3db801cd4d54fbf0080a39aeaf016ddd3 100644 (file)
--- a/ext/gd/tests/bug44849.phpt
+++ b/ext/gd/tests/bug44849.phpt
@@ -2,8 +2,7 @@
 Bug #44849 (imagecolorclosesthwb is not available on Windows)
 --SKIPIF--
 <?php
-       if(!extension_loaded('gd')){ die('skip: gd extension not available'); }
-       if(strtoupper(substr(PHP_OS, 0, 3)) != 'WIN'){ die('skip: not a Windows operating system'); }
+       if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 ?>
 --FILE--
 <?php

diff --git a/ext/gd/tests/imagecolorclosesthwb.phpt b/ext/gd/tests/imagecolorclosesthwb.phpt
index fe3927896eb97c6a82bdef4e139e45b9d988a2ee..4266514a85dde001ccb915b89ac23040e9a84e1b 100644 (file)
--- a/ext/gd/tests/imagecolorclosesthwb.phpt
+++ b/ext/gd/tests/imagecolorclosesthwb.phpt
@@ -7,21 +7,24 @@ imagecolorclosesthwb() test
 ?>
 --FILE--
 <?php
-       $im = imagecreatefrompng('test.png');
+       $im = imagecreatefrompng(dirname(__FILE__).'/test.png');
 
-       echo imagecolorclosesthwb($im, 255, 50, 0);
+       var_dump(imagecolorclosesthwb($im, 255, 50, 0));
 
-       imagecolorclosesthwb(NULL);
-       imagecolorclosesthwb(NULL, NULL, NULL, NULL);
-       imagecolorclosesthwb($im, "hello", "from", "gd");
+       var_dump(imagecolorclosesthwb(NULL));
+       var_dump(imagecolorclosesthwb(NULL, NULL, NULL, NULL));
+       var_dump(imagecolorclosesthwb($im, "hello", "from", "gd"));
 
        imagedestroy($im);
 ?>
 --EXPECTF--
-16724480
+int(16724480)
 
-Warning: imagecolorclosesthwb\(\) expects exactly 4 parameters, 1 given in .* code on line \d+
+Warning: imagecolorclosesthwb() expects exactly 4 parameters, 1 given in %s on line %d
+NULL
 
-Warning: imagecolorclosesthwb\(\) expects parameter 1 to be resource, null given in .* code on line \d+
+Warning: imagecolorclosesthwb() expects parameter 1 to be resource, null given in %s on line %d
+NULL
 
-Warning: imagecolorclosesthwb\(\) expects parameter 2 to be long, string given in .* code on line \d+
\ No newline at end of file
+Warning: imagecolorclosesthwb() expects parameter 2 to be long, string given in %s on line %d
+NULL