Skip to content

Commit 9cad78c

Browse files
committed
fix other tests for Windows x86 build
1 parent 826733a commit 9cad78c

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

ext/gd/tests/bug77269.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Bug #77269 (Potential unsigned underflow in gdImageScale)
44
<?php
55
if (!extension_loaded('gd')) die('skip gd extension not available');
66
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
7+
if (substr(PHP_OS, 0, 3) == 'WIN' && PHP_INT_SIZE === 4) die("skip not for Windows x86");
78
?>
89
--INI--
910
memory_limit=2G

ext/gd/tests/bug77272.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ memory_limit=-1
77
if (!extension_loaded('gd')) die('skip gd extension not available');
88
if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<=')) die('skip upstream fix not yet released');
99
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
10+
if (substr(PHP_OS, 0, 3) == 'WIN' && PHP_INT_SIZE === 4) die("skip not for Windows x86");
1011
?>
1112
--FILE--
1213
<?php

ext/mysqli/tests/bug73462.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ require_once('skipifconnectfailure.inc');
1010
require_once("connect.inc");
1111

1212
/* Initial persistent connection */
13-
$mysql_1 = new mysqli('p:'.$host, $user, $passwd, $db);
13+
$mysql_1 = new mysqli('p:'.$host, $user, $passwd, $db, $port);
1414
$result = $mysql_1->query("SHOW STATUS LIKE 'Connections'");
1515
$c1 = $result->fetch_row();
1616
$result->free();
1717
$mysql_1->close();
1818

1919
/* Failed connection to invalid host */
20-
$mysql_2 = @new mysqli(' !!! invalid !!! ', $user, $passwd, $db);
20+
$mysql_2 = @new mysqli(' !!! invalid !!! ', $user, $passwd, $db, $port);
2121
try {
2222
$mysql_2->close();
2323
} catch (Error $exception) {
2424
echo $exception->getMessage() . "\n";
2525
}
2626

2727
/* Re-use persistent connection */
28-
$mysql_3 = new mysqli('p:'.$host, $user, $passwd, $db);
28+
$mysql_3 = new mysqli('p:'.$host, $user, $passwd, $db, $port);
2929
$error = mysqli_connect_errno();
3030
$result = $mysql_3->query("SHOW STATUS LIKE 'Connections'");
3131
$c3 = $result->fetch_row();

ext/mysqli/tests/bug73949.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class cc{
1313
function __construct($c=null){
1414
}
1515
};
16-
$i=mysqli_connect('p:'.$host, $user, $passwd, $db);
16+
$i=mysqli_connect('p:'.$host, $user, $passwd, $db, $port);
1717
$res=mysqli_query($i, "SHOW STATUS LIKE 'Connections'");
1818
$t=array(new stdClass);
1919
while($db= mysqli_fetch_object($res,'cc',$t)){}

ext/phar/tests/bug69958.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ $tarphar = new PharData(__DIR__.'/bug69958.tar');
1010
$phar = $tarphar->convertToData(Phar::TAR);
1111
?>
1212
--EXPECTF--
13-
Fatal error: Uncaught BadMethodCallException: phar "%s/bug69958.tar" exists and must be unlinked prior to conversion in %s/bug69958.php:%d
13+
Fatal error: Uncaught BadMethodCallException: phar "%sbug69958.tar" exists and must be unlinked prior to conversion in %sbug69958.php:%d
1414
Stack trace:
15-
#0 %s/bug69958.php(%d): PharData->convertToData(%d)
15+
#0 %sbug69958.php(%d): PharData->convertToData(%d)
1616
#1 {main}
17-
thrown in %s/bug69958.php on line %d
17+
thrown in %sbug69958.php on line %d

0 commit comments

Comments
 (0)