Skip to content

Commit f6dea34

Browse files
committed
Fix test cases which fail on Windows debug builds
We use the portable {TMP} instead of the hard-coded /tmp, and skip mysqli_debug_append.phpt on Windows, because unlinking the trace file while the connection is still open won't work there. (cherry picked from commit 60081ca)
1 parent bc529b9 commit f6dea34

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

ext/mysqli/tests/mysqli_debug_append.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
1717

1818
if (!$IS_MYSQLND)
1919
die("SKIP Libmysql feature not sufficiently spec'd in MySQL C API documentation");
20+
21+
if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test is not for Windows platforms");
2022
?>
2123
--FILE--
2224
<?php

ext/mysqli/tests/mysqli_store_result_buffered_c.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require_once('skipifemb.inc');
77
require_once('skipifconnectfailure.inc');
88
?>
99
--INI--
10-
mysqlnd.debug=d:t:O,/tmp/mysqlnd.trace
10+
mysqlnd.debug=d:t:O,{TMP}/mysqlnd.trace
1111
--FILE--
1212
<?php
1313
require_once("connect.inc");

ext/mysqli/tests/mysqli_store_result_copy.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if (!$IS_MYSQLND) {
1010
}
1111
?>
1212
--INI--
13-
mysqlnd.debug=d:t:O,/tmp/mysqlnd.trace
13+
mysqlnd.debug=d:t:O,{TMP}/mysqlnd.trace
1414
mysqlnd.net_read_buffer_size=1
1515
mysqlnd.mempool_default_size=1
1616
mysqlnd.fetch_data_copy=0

0 commit comments

Comments
 (0)