Skip to content

Remove unnecessary skip checks #13637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 8, 2024
Merged

Remove unnecessary skip checks #13637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ext/mysqli/tests/bug46614.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!defined("MYSQLI_ASYNC")) {
die("skip mysqlnd only");
}
?>
--FILE--
<?php
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/bug47050.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!defined("MYSQLI_ASYNC")) {
die("skip mysqlnd only");
}
?>
--FILE--
<?php
Expand Down
1 change: 0 additions & 1 deletion ext/mysqli/tests/bug73800.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ mysqli
<?php
require_once 'skipifconnectfailure.inc';
if (PHP_INT_SIZE != 8) die('skip requires 64-bit');
if (!defined('MYSQLI_OPT_INT_AND_FLOAT_NATIVE')) die('skip requires mysqlnd');
?>
--FILE--
<?php
Expand Down
1 change: 0 additions & 1 deletion ext/mysqli/tests/bug77597.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
?>
--FILE--
<?php
Expand Down
1 change: 0 additions & 1 deletion ext/mysqli/tests/bug79375.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ mysqli
<?php
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
require_once 'skipifconnectfailure.inc';
if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
?>
--FILE--
<?php
Expand Down
1 change: 0 additions & 1 deletion ext/mysqli/tests/bug80837.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
?>
--FILE--
<?php
Expand Down
9 changes: 2 additions & 7 deletions ext/mysqli/tests/deprecated_constants.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ echo constant('MYSQLI_NO_DATA')."\n";
echo constant('MYSQLI_DATA_TRUNCATED')."\n";
echo constant('MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED')."\n";
echo constant('MYSQLI_SERVER_QUERY_NO_INDEX_USED')."\n";
if (stristr(mysqli_get_client_info(), 'mysqlnd')) {
echo constant('MYSQLI_SERVER_QUERY_WAS_SLOW')."\n";
echo constant('MYSQLI_SERVER_PS_OUT_PARAMS')."\n";
} else {
print("\nDeprecated: Constant MYSQLI_SERVER_QUERY_WAS_SLOW is deprecated in dummy\n-1\n");
print("\nDeprecated: Constant MYSQLI_SERVER_PS_OUT_PARAMS is deprecated in dummy\n-1\n");
}
echo constant('MYSQLI_SERVER_QUERY_WAS_SLOW')."\n";
echo constant('MYSQLI_SERVER_PS_OUT_PARAMS')."\n";
echo constant('MYSQLI_IS_MARIADB')."\n";

?>
Expand Down
3 changes: 1 addition & 2 deletions ext/mysqli/tests/mysqli_explain_metadata.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ require_once 'skipifconnectfailure.inc';
var_dump($fields);
}

if (function_exists('mysqli_stmt_get_result') &&
$stmt->prepare('EXPLAIN SELECT t1.*, t2.* FROM test AS t1, test AS t2') &&
if ($stmt->prepare('EXPLAIN SELECT t1.*, t2.* FROM test AS t1, test AS t2') &&
$stmt->execute()) {
if (!$res_stmt = mysqli_stmt_get_result($stmt)) {
printf("[017] Cannot fetch result from PS [%d] %s\n",
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_get_client_stats.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_client_stats')) {
die("skip only available with mysqlnd");
}
?>
--INI--
mysqlnd.collect_statistics=1
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_client_stats')) {
die("skip only available with mysqlnd");
}
?>
--INI--
mysqlnd.collect_statistics=1
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_get_client_stats_off.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_client_stats')) {
die("skip only available with mysqlnd");
}
?>
--INI--
mysqlnd.collect_statistics=0
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_client_stats')) {
die("skip only available with mysqlnd");
}
?>
--INI--
mysqlnd.collect_statistics=1
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_client_stats')) {
die("skip only available with mysqlnd");
}
?>
--FILE--
<?php
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_get_connection_stats.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_connection_stats')) {
die("skip only available with mysqlnd");
}
?>
--FILE--
<?php
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_connection_stats')) {
die("skip only available with mysqlnd");
}
?>
--FILE--
<?php
Expand Down
52 changes: 24 additions & 28 deletions ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,43 +63,39 @@ if (mysqli_get_server_version($link) <= 50000) {
}


if (function_exists('mysqli_stmt_get_result')) {

if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
printf("[019] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));

if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
// no result set, one output parameter
if (!$stmt = mysqli_prepare($link, 'CALL p(@version)'))
printf("[020] Cannot prepare CALL, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
printf("[019] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));

if (!mysqli_stmt_execute($stmt))
printf("[021] Cannot execute CALL, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
// no result set, one output parameter
if (!$stmt = mysqli_prepare($link, 'CALL p(@version)'))
printf("[020] Cannot prepare CALL, [%d] %s\n", mysqli_errno($link), mysqli_error($link));

if (!mysqli_stmt_close($stmt))
printf("[022] Cannot close statement, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if (!mysqli_stmt_execute($stmt))
printf("[021] Cannot execute CALL, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));

if (!$stmt = mysqli_prepare($link, 'SELECT @version AS _version'))
printf("[023] Cannot prepare SELECT, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_stmt_close($stmt))
printf("[022] Cannot close statement, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));

if (!mysqli_stmt_execute($stmt))
printf("[024] Cannot execute SELECT, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if (!$stmt = mysqli_prepare($link, 'SELECT @version AS _version'))
printf("[023] Cannot prepare SELECT, [%d] %s\n", mysqli_errno($link), mysqli_error($link));

if (!$res = mysqli_stmt_get_result($stmt))
printf("[025] Cannot get result set, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if (!mysqli_stmt_execute($stmt))
printf("[024] Cannot execute SELECT, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));

if ((!($row = mysqli_fetch_assoc($res))) || ($row['_version'] == ""))
printf("[026] Results seem wrong, got %s, [%d] %s\n",
$row['_version'],
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if (!$res = mysqli_stmt_get_result($stmt))
printf("[025] Cannot get result set, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));

mysqli_free_result($res);
mysqli_stmt_close($stmt);
if ((!($row = mysqli_fetch_assoc($res))) || ($row['_version'] == ""))
printf("[026] Results seem wrong, got %s, [%d] %s\n",
$row['_version'],
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));

} else {
printf("[027] Cannot create SP, [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
}
mysqli_free_result($res);
mysqli_stmt_close($stmt);

} else {
printf("[027] Cannot create SP, [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
}

if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_stmt_get_result.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';

if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php
Expand Down
2 changes: 0 additions & 2 deletions ext/mysqli/tests/mysqli_stmt_get_result2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php
Expand Down
4 changes: 0 additions & 4 deletions ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ Fetching BIT column values using the PS API
mysqli
--SKIPIF--
<?php
if (!function_exists('mysqli_stmt_get_result')) {
die("skip mysqli_stmt_get_result() not available");
}

require_once 'connect.inc';
if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';

if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ mysqli
<?php
require_once 'skipifconnectfailure.inc';

if (!function_exists('mysqli_stmt_get_result'))
die("skip mysqli_stmt_get_result() not available");

if (!defined("MYSQLI_TYPE_GEOMETRY"))
die("skip MYSQLI_TYPE_GEOMETRY not defined");
?>
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';

if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';

if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';

if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';

if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';

if (!function_exists('mysqli_stmt_get_result'))
die("skip mysqli_stmt_get_result() not available");
?>
--FILE--
<?php
Expand Down
Loading