From 0aa3acc6c420ef19a33ee80e65c4fb2f2ee128d0 Mon Sep 17 00:00:00 2001 From: Fabien Villepinte Date: Sat, 28 Sep 2019 21:29:54 +0200 Subject: Fix borked SKIPIFs --- ext/mysqli/tests/045.phpt | 2 +- ext/mysqli/tests/mysqli_auth_pam.phpt | 2 +- ext/mysqli/tests/mysqli_expire_password.phpt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/mysqli') diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt index 5eff0b03bc..0b7b68239c 100644 --- a/ext/mysqli/tests/045.phpt +++ b/ext/mysqli/tests/045.phpt @@ -7,7 +7,7 @@ mysqli_stmt_bind_result (SHOW) require_once('skipifconnectfailure.inc'); require_once("connect.inc"); - $link = my_mysqli_connect($host, $user, $passwd); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'"); mysqli_stmt_execute($stmt); diff --git a/ext/mysqli/tests/mysqli_auth_pam.phpt b/ext/mysqli/tests/mysqli_auth_pam.phpt index 86c5c4809a..30d2da5675 100644 --- a/ext/mysqli/tests/mysqli_auth_pam.phpt +++ b/ext/mysqli/tests/mysqli_auth_pam.phpt @@ -6,7 +6,7 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('connect.inc'); -if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { +if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket)); } diff --git a/ext/mysqli/tests/mysqli_expire_password.phpt b/ext/mysqli/tests/mysqli_expire_password.phpt index 853daf0cdf..fdf8b783fb 100644 --- a/ext/mysqli/tests/mysqli_expire_password.phpt +++ b/ext/mysqli/tests/mysqli_expire_password.phpt @@ -6,7 +6,7 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('connect.inc'); -if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { +if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket)); } -- cgit v1.2.1