diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-11 12:14:05 +0100 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-11 12:14:38 +0100 |
commit | 60081ca20d5701111de5f94ae64909b1cc265f1e (patch) | |
tree | 503845569bcce5ff10944e89a3f39b3f4ffe6f41 /ext/mysqli | |
parent | ecd0c5b6ad68fb9255c07a96a25f0b7852e882ff (diff) | |
download | php-git-60081ca20d5701111de5f94ae64909b1cc265f1e.tar.gz |
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.
Diffstat (limited to 'ext/mysqli')
-rw-r--r-- | ext/mysqli/tests/mysqli_debug_append.phpt | 2 | ||||
-rw-r--r-- | ext/mysqli/tests/mysqli_store_result_buffered_c.phpt | 2 | ||||
-rw-r--r-- | ext/mysqli/tests/mysqli_store_result_copy.phpt | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/ext/mysqli/tests/mysqli_debug_append.phpt b/ext/mysqli/tests/mysqli_debug_append.phpt index 68e600772b..8c934eabac 100644 --- a/ext/mysqli/tests/mysqli_debug_append.phpt +++ b/ext/mysqli/tests/mysqli_debug_append.phpt @@ -17,6 +17,8 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED) if (!$IS_MYSQLND) die("SKIP Libmysql feature not sufficiently spec'd in MySQL C API documentation"); + +if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test is not for Windows platforms"); ?> --FILE-- <?php diff --git a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt index 58d588ac49..cc776f01e2 100644 --- a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt +++ b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt @@ -7,7 +7,7 @@ require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- -mysqlnd.debug=d:t:O,/tmp/mysqlnd.trace +mysqlnd.debug=d:t:O,{TMP}/mysqlnd.trace --FILE-- <?php require_once("connect.inc"); diff --git a/ext/mysqli/tests/mysqli_store_result_copy.phpt b/ext/mysqli/tests/mysqli_store_result_copy.phpt index 3f82b8a892..dbe5d2f905 100644 --- a/ext/mysqli/tests/mysqli_store_result_copy.phpt +++ b/ext/mysqli/tests/mysqli_store_result_copy.phpt @@ -10,7 +10,7 @@ if (!$IS_MYSQLND) { } ?> --INI-- -mysqlnd.debug=d:t:O,/tmp/mysqlnd.trace +mysqlnd.debug=d:t:O,{TMP}/mysqlnd.trace mysqlnd.net_read_buffer_size=1 mysqlnd.mempool_default_size=1 mysqlnd.fetch_data_copy=0 |