Test was fixed.

diff --git a/ext/gd/tests/imagefilter.phpt b/ext/gd/tests/imagefilter.phpt
index 3b97657a0d63a2fcbcb1df19a0ab6c7704df010d..57f5e5412f1bb1e1480fa37b45dfe4dd3fa46c93 100644 (file)
--- a/ext/gd/tests/imagefilter.phpt
+++ b/ext/gd/tests/imagefilter.phpt
@@ -27,9 +27,9 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
        foreach ($no_arg_filters as $filt) {
                $im = imagecreatefrompng($SOURCE_IMG);
                if (imagefilter($im, constant($filt))) {
-                       imagepng($im, $SAVE_DIR. $filt. ".png");
+                       imagepng($im, $SAVE_DIR."/".$filt. ".png");
                        echo "$filt success\n";
-                       @unlink($SAVE_DIR. $filt. ".png");
+                       @unlink($SAVE_DIR."/".$filt. ".png");
                } else {
                        echo "$filt failed\n";
                }
@@ -38,9 +38,9 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
        $im = imagecreatefrompng($SOURCE_IMG);
        
        if (imagefilter($im, IMG_FILTER_SMOOTH, -1924.124)) {
-               imagepng($im, $SAVE_DIR . "IMG_FILTER_SMOOTH.png");
+               imagepng($im, $SAVE_DIR . "/IMG_FILTER_SMOOTH.png");
                echo "IMG_FILTER_SMOOTH success\n";
-               @unlink($SAVE_DIR . "IMG_FILTER_SMOOTH.png");
+               @unlink($SAVE_DIR . "/IMG_FILTER_SMOOTH.png");
        } else {
                echo "IMG_FILTER_SMOOTH failed\n";
        }
@@ -48,9 +48,9 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
        $im = imagecreatefrompng($SOURCE_IMG);
        
        if (imagefilter($im, IMG_FILTER_COLORIZE, -127.12, -127.98, 127)) {
-               imagepng($im, $SAVE_DIR . "IMG_FILTER_COLORIZE.png");
+               imagepng($im, $SAVE_DIR . "/IMG_FILTER_COLORIZE.png");
                echo "IMG_FILTER_COLORIZE success\n";
-               unlink($SAVE_DIR . "IMG_FILTER_COLORIZE.png");
+               unlink($SAVE_DIR . "/IMG_FILTER_COLORIZE.png");
        } else {
                echo "IMG_FILTER_COLORIZE failed\n";
        }
@@ -58,9 +58,9 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
        $im = imagecreatefrompng($SOURCE_IMG);
        
        if (imagefilter($im, IMG_FILTER_CONTRAST, -90)) {
-               imagepng($im, $SAVE_DIR . "IMG_FILTER_CONTRAST.png");
+               imagepng($im, $SAVE_DIR . "/IMG_FILTER_CONTRAST.png");
                echo "IMG_FILTER_CONTRAST success\n";
-               unlink($SAVE_DIR . "IMG_FILTER_CONTRAST.png");
+               unlink($SAVE_DIR . "/IMG_FILTER_CONTRAST.png");
        } else {
                echo "IMG_FILTER_CONTRAST failed\n";
        }
@@ -68,9 +68,9 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
        $im = imagecreatefrompng($SOURCE_IMG);
        
        if (imagefilter($im, IMG_FILTER_BRIGHTNESS, 98)) {
-               imagepng($im, $SAVE_DIR . "IMG_FILTER_BRIGHTNESS.png");
+               imagepng($im, $SAVE_DIR . "/IMG_FILTER_BRIGHTNESS.png");
                echo "IMG_FILTER_BRIGHTNESS success\n";
-               unlink($SAVE_DIR . "IMG_FILTER_BRIGHTNESS.png");
+               unlink($SAVE_DIR . "/IMG_FILTER_BRIGHTNESS.png");
        } else {
                echo "IMG_FILTER_BRIGHTNESS failed\n";
        }

diff --git a/ext/standard/tests/filters/bug22538.phpt b/ext/standard/tests/filters/bug22538.phpt
index c01978730b59dccf70a702fbd75b249ee8889cef..438b5be31f8dc175f4b0d71fe407da6fe4505ee4 100644 (file)
--- a/ext/standard/tests/filters/bug22538.phpt
+++ b/ext/standard/tests/filters/bug22538.phpt
@@ -15,7 +15,7 @@ do {
        $path2 = sprintf("%s/%s%db", dirname(__FILE__), uniqid(), time());
 } while ($path1 == $path2);
 
-$fp = fopen($path1, "w");
+$fp = fopen($path1, "w") or die("Can not open $path1\n");
 $str = "abcdefghijklmnopqrstuvwxyz\n";
 $str_len = strlen($str);
 $cnt = $size;
@@ -24,8 +24,8 @@ while (($cnt -= $str_len) > 0) {
 }
 $cnt = $size - ($str_len + $cnt);
 fclose($fp);
-$fin = fopen($path1, "r");
-$fout = fopen($path2, "w");
+$fin = fopen($path1, "r") or die("Can not open $path1\n");;
+$fout = fopen($path2, "w") or die("Can not open $path2\n");;
 stream_filter_append($fout, "string.rot13");
 my_stream_copy_to_stream($fin, $fout);
 fclose($fout);