Skip to content

Commit c27feaa

Browse files
committed
fix tests for Windows x86 build -cherrypick 9744
1 parent 048e0ea commit c27feaa

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
@@ -5,6 +5,7 @@ gd
55
--SKIPIF--
66
<?php
77
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
8+
if (substr(PHP_OS, 0, 3) == 'WIN' && PHP_INT_SIZE === 4) die("skip not for Windows x86");
89
?>
910
--INI--
1011
memory_limit=2G

ext/gd/tests/bug77272.phpt

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

ext/mysqli/tests/bug73462.phpt

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

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

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

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

ext/mysqli/tests/bug73949.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class cc{
1414
function __construct($c=null){
1515
}
1616
};
17-
$i=mysqli_connect('p:'.$host, $user, $passwd, $db);
17+
$i=mysqli_connect('p:'.$host, $user, $passwd, $db, $port);
1818
$res=mysqli_query($i, "SHOW STATUS LIKE 'Connections'");
1919
$t=array(new stdClass);
2020
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)