Drop skipifemb.inc

And drop the last remaining uses of it.

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 452cb7d8f730e28e71b6d67eddcb43fefd30b4e1..d2894f2c0d416664a35eded94f31aa433f55126e 100644 (file)
--- 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--\r
 <?php\r
 require_once('skipif.inc');\r
-require_once('skipifemb.inc');\r
 require_once('skipifconnectfailure.inc');\r
 ?>\r
 --FILE--\r

diff --git a/ext/mysqli/tests/mysqli_driver_unclonable.phpt b/ext/mysqli/tests/mysqli_driver_unclonable.phpt
index 98559f46fc2beab6ec94a5c047af244a1c470bc5..c51d5d5245b30045094b2b73cccad45211f47ad9 100644 (file)
--- 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 88e1e85e156032a8d1797aad9a8e38c0a880afc7..28f4974ba181950de13a5d46c432b848f46ac654 100644 (file)
--- 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 fe591c2fe72d92d5b04ee4e0b9cf7b5ca67b1233..2b87083cbd483a25bd1a5cfad75ea5be4c37c4d3 100644 (file)
--- 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 5a5c2658038e1c6f69faafc2417f8db9873b1055..0a9fa583d134d0a164b433805fc4c5cadba40339 100644 (file)
--- 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 8c3c65f6091820e1b59108441994bfda677fb3be..3c44f8a309edcdcf8f0469908ba3c05cf907bac9 100644 (file)
--- 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 (file)
index 2b7941d..0000000
--- 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");
-?>