From: Christoph M. Becker <cmb@php.net>
Date: Fri, 15 Jul 2016 19:05:59 +0000 (+0200)
Subject: Un-XFAIL test case
X-Git-Tag: php-7.1.0beta1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=530f9666feb05d803db9e0f9f3006847cfb7e32d;p=php

Un-XFAIL test case

libgd substitutes unallowed characters of XBM names (but not filenames),
depending on the locale. As we're interested in the filenames in this case
we simply ignore these differences.
---

diff --git a/ext/gd/tests/bug66339-mb.phpt b/ext/gd/tests/bug66339-mb.phpt
index c7cc940a8f..76e3af7c8f 100644
--- a/ext/gd/tests/bug66339-mb.phpt
+++ b/ext/gd/tests/bug66339-mb.phpt
@@ -4,8 +4,6 @@ Bug #66339 (PHP segfaults in imagexbm)
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
 ?>
---XFAIL--
-libxpbm works different way linux an dwindows, to investigate
 --FILE--
 <?php
 $im = imagecreate(8, 8);
@@ -21,13 +19,13 @@ echo file_get_contents('./bug66339私はガラスを食べられます.xbm');
 <?php
 unlink('./bug66339私はガラスを食べられます.xbm');
 ?>
---EXPECT--
+--EXPECTF--
 #define image_width 8
 #define image_height 8
 static unsigned char image_bits[] = {
   0xFF, 0xFF, 0x83, 0x83, 0x83, 0x83, 0x83, 0xFF};
 ------------
-#define bug66339_width 8
-#define bug66339_height 8
-static unsigned char bug66339_bits[] = {
+#define bug66339%swidth 8
+#define bug66339%sheight 8
+static unsigned char bug66339%sbits[] = {
   0xFF, 0xFF, 0x83, 0x83, 0x83, 0x83, 0x83, 0xFF};