diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-18 15:49:35 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-18 15:49:35 +0200 |
commit | 2d002258b800ee92dc99d577304e5f09fbb629b4 (patch) | |
tree | f0d8bb5b75f0dff2f6afab864c06f05844ca100c | |
parent | b40ffa9bfdc09d88a87fd4ccaca0879a48ae0086 (diff) | |
download | php-git-2d002258b800ee92dc99d577304e5f09fbb629b4.tar.gz |
Drop skipifemb.inc
And drop the last remaining uses of it.
7 files changed, 1 insertions, 12 deletions
diff --git a/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt b/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt index 452cb7d8f7..d2894f2c0d 100644 --- a/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt +++ b/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt @@ -3,7 +3,6 @@ Fail gracefully on empty result set --SKIPIF--
<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
diff --git a/ext/mysqli/tests/mysqli_driver_unclonable.phpt b/ext/mysqli/tests/mysqli_driver_unclonable.phpt index 98559f46fc..c51d5d5245 100644 --- a/ext/mysqli/tests/mysqli_driver_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_driver_unclonable.phpt @@ -2,7 +2,6 @@ Trying to clone mysqli_driver object --SKIPIF-- <?php require_once('skipif.inc'); ?> -<?php require_once('skipifemb.inc'); ?> --FILE-- <?php $driver = new mysqli_driver; diff --git a/ext/mysqli/tests/mysqli_get_client_version.phpt b/ext/mysqli/tests/mysqli_get_client_version.phpt index 88e1e85e15..28f4974ba1 100644 --- a/ext/mysqli/tests/mysqli_get_client_version.phpt +++ b/ext/mysqli/tests/mysqli_get_client_version.phpt @@ -2,7 +2,6 @@ mysqli_get_client_version() --SKIPIF-- <?php require_once('skipif.inc'); ?> -<?php require_once('skipifemb.inc'); ?> --FILE-- <?php if (!is_int($info = mysqli_get_client_version()) || ($info < 100)) diff --git a/ext/mysqli/tests/mysqli_options_init_command.phpt b/ext/mysqli/tests/mysqli_options_init_command.phpt index fe591c2fe7..2b87083cbd 100644 --- a/ext/mysqli/tests/mysqli_options_init_command.phpt +++ b/ext/mysqli/tests/mysqli_options_init_command.phpt @@ -5,7 +5,6 @@ mysqli_options() require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> -<?php require_once('skipifemb.inc'); ?> --FILE-- <?php /* see mysqli.c for details */ diff --git a/ext/mysqli/tests/mysqli_real_connect_compression_error.phpt b/ext/mysqli/tests/mysqli_real_connect_compression_error.phpt index 5a5c265803..0a9fa583d1 100644 --- a/ext/mysqli/tests/mysqli_real_connect_compression_error.phpt +++ b/ext/mysqli/tests/mysqli_real_connect_compression_error.phpt @@ -3,7 +3,6 @@ Bug #80107 mysqli_query() fails for ~16 MB long query when compression is enable --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once("connect.inc"); $link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!$link) { diff --git a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt index 8c3c65f609..3c44f8a309 100644 --- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt @@ -4,11 +4,10 @@ References to result sets - mysqlnd (no copies but references) <?php require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); - require_once('connect.inc'); if (!$IS_MYSQLND) die("skip Test for mysqlnd only"); -require_once('skipifemb.inc'); ?> +?> --FILE-- <?php require_once('connect.inc'); diff --git a/ext/mysqli/tests/skipifemb.inc b/ext/mysqli/tests/skipifemb.inc deleted file mode 100644 index 2b7941d825..0000000000 --- a/ext/mysqli/tests/skipifemb.inc +++ /dev/null @@ -1,5 +0,0 @@ -<?php - $driver = new mysqli_driver(); - if ($driver->embedded) - die("skip test doesn't run with embedded server"); -?> |