From 6de2f05f8e1629b9a77a6ec2390ba02d86a9324f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E5=A4=A9=E5=B3=B0-Rango?= <mikan.tenny@gmail.com>
Date: Tue, 30 Nov 2021 10:30:41 +0800
Subject: [PATCH] Version 4.8.3 (#4515)

* Update version

* Update package.xml
---
 CMakeLists.txt                                |  2 +-
 ext-src/php_swoole_library.h                  |  8 +--
 include/swoole_version.h                      |  6 +-
 package.xml                                   | 60 +++++++++++++++++--
 .../sockets/basic/bug46360.phpt               |  3 +-
 .../sockets/basic/bug49341.phpt               |  3 +-
 .../sockets/basic/bug63000.phpt               |  3 +-
 .../sockets/basic/bug76839.phpt               |  3 +-
 .../sockets/basic/ipv4loop.phpt               |  3 +-
 .../sockets/basic/ipv6loop.phpt               |  3 +-
 .../sockets/basic/mcast_ipv4_recv.phpt        |  3 +-
 .../sockets/basic/mcast_ipv4_send.phpt        |  3 +-
 .../sockets/basic/mcast_ipv4_send_error.phpt  |  3 +-
 .../sockets/basic/mcast_ipv6_recv.phpt        |  3 +-
 .../basic/mcast_ipv6_recv_limited.phpt        |  3 +-
 .../sockets/basic/mcast_ipv6_send.phpt        |  3 +-
 .../sockets/basic/socket_accept_failure.phpt  |  4 +-
 .../sockets/basic/socket_bind.phpt            |  3 +-
 .../sockets/basic/socket_clear_error.phpt     |  3 +-
 .../sockets/basic/socket_connect_params.phpt  |  3 +-
 .../basic/socket_create_listen-nobind.phpt    |  4 +-
 .../sockets/basic/socket_create_listen.phpt   |  3 +-
 .../basic/socket_create_listen_used.phpt      |  4 +-
 .../sockets/basic/socket_create_pair.phpt     |  3 +-
 .../sockets/basic/socket_getopt.phpt          |  4 +-
 .../sockets/basic/socket_getpeername.phpt     |  3 +-
 .../basic/socket_getpeername_ipv4loop.phpt    |  3 +-
 .../basic/socket_getpeername_ipv6loop.phpt    |  3 +-
 .../sockets/basic/socket_getsockname.phpt     |  3 +-
 .../basic/socket_listen-wrongparams.phpt      |  3 +-
 .../sockets/basic/socket_read_params.phpt     |  3 +-
 .../basic/socket_select-wrongparams-2.phpt    |  3 +-
 .../sockets/basic/socket_select.phpt          |  3 +-
 .../sockets/basic/socket_select_error.phpt    |  3 +-
 .../socket_sentto_recvfrom_ipv4_udp.phpt      |  3 +-
 .../socket_sentto_recvfrom_ipv6_udp.phpt      |  3 +-
 .../basic/socket_sentto_recvfrom_unix.phpt    |  3 +-
 .../basic/socket_set_block-retval.phpt        |  3 +-
 .../basic/socket_set_nonblock-retval.phpt     |  3 +-
 .../sockets/basic/socket_set_nonblock.phpt    |  3 +-
 .../basic/socket_set_option_bindtodevice.phpt |  3 +-
 ...socket_set_option_error_socket_option.phpt |  3 +-
 .../basic/socket_set_option_in6_pktinfo.phpt  |  3 +-
 .../basic/socket_set_option_rcvtimeo.phpt     |  3 +-
 .../basic/socket_set_option_seolinger.phpt    |  3 +-
 .../basic/socket_set_option_sndtimeo.phpt     |  3 +-
 .../sockets/basic/socket_setopt_basic.phpt    |  3 +-
 .../sockets/basic/socket_shutdown.phpt        |  3 +-
 .../sockets/basic/socket_strerror.phpt        |  3 +-
 .../sockets/basic/unixloop.phpt               |  3 +-
 50 files changed, 154 insertions(+), 64 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abe50062500..074afaddd54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT(libswoole)
 
 ENABLE_LANGUAGE(ASM)
-set(SWOOLE_VERSION 4.8.2)
+set(SWOOLE_VERSION 4.8.3)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")
diff --git a/ext-src/php_swoole_library.h b/ext-src/php_swoole_library.h
index 3eb5ea386d5..f2ad043e5b1 100644
--- a/ext-src/php_swoole_library.h
+++ b/ext-src/php_swoole_library.h
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+             
  */
 
-/* $Id: 471e0a545312f42c2cfc3004e66d1ff3656bc9bf */
+/* $Id: acfe73e33caae4c5d12da7456a261b64b191f588 */
 
 static const char* swoole_library_source_constants =
     "\n"
@@ -295,8 +295,6 @@ static const char* swoole_library_source_core_constant =
     "\n"
     "    public const OPTION_STACK_SIZE = 'stack_size';\n"
     "\n"
-    "    public const OPTION_NAME_RESOLVER = 'name_resolver';\n"
-    "\n"
     "    public const OPTION_DNS_CACHE_EXPIRE = 'dns_cache_expire';\n"
     "\n"
     "    public const OPTION_DNS_CACHE_CAPACITY = 'dns_cache_capacity';\n"
@@ -305,8 +303,6 @@ static const char* swoole_library_source_core_constant =
     "\n"
     "    public const OPTION_RECONNECT = 'reconnect';\n"
     "\n"
-    "    public const OPTION_MAX_RETRIES = 'max_retries';\n"
-    "\n"
     "    public const OPTION_DEFER = 'defer';\n"
     "\n"
     "    public const OPTION_LOWERCASE_HEADER = 'lowercase_header';\n"
@@ -375,8 +371,6 @@ static const char* swoole_library_source_core_constant =
     "\n"
     "    public const OPTION_MAX_QUEUED_BYTES = 'max_queued_bytes';\n"
     "\n"
-    "    public const OPTION_WORKER_MAX_CONCURRENCY = 'worker_max_concurrency';\n"
-    "\n"
     "    public const OPTION_SEND_TIMEOUT = 'send_timeout';\n"
     "\n"
     "    public const OPTION_DISPATCH_MODE = 'dispatch_mode';\n"
diff --git a/include/swoole_version.h b/include/swoole_version.h
index fd637f7371c..635a21280f2 100644
--- a/include/swoole_version.h
+++ b/include/swoole_version.h
@@ -20,10 +20,10 @@
 
 #define SWOOLE_MAJOR_VERSION 4
 #define SWOOLE_MINOR_VERSION 8
-#define SWOOLE_RELEASE_VERSION 2
+#define SWOOLE_RELEASE_VERSION 3
 #define SWOOLE_EXTRA_VERSION ""
-#define SWOOLE_VERSION "4.8.2"
-#define SWOOLE_VERSION_ID 40802
+#define SWOOLE_VERSION "4.8.3"
+#define SWOOLE_VERSION_ID 40803
 #define SWOOLE_API_VERSION_ID 0x202109a
 
 #define SWOOLE_BUG_REPORT                                                                                              \
diff --git a/package.xml b/package.xml
index f11814fa684..6efbf083fd4 100644
--- a/package.xml
+++ b/package.xml
@@ -51,10 +51,10 @@
         <email>doubaokun@php.net</email>
         <active>yes</active>
     </developer>
-    <date>2021-11-17</date>
-    <time>13:00:00</time>
+    <date>2021-11-29</date>
+    <time>11:00:00</time>
     <version>
-        <release>4.8.2</release>
+        <release>4.8.3</release>
         <api>4.0</api>
     </version>
     <stability>
@@ -531,6 +531,8 @@
             <file role="src" name="ext-src/swoole_coroutine_system.cc" />
             <file role="src" name="ext-src/swoole_curl.cc" />
             <file role="src" name="ext-src/swoole_event.cc" />
+            <file role="src" name="ext-src/swoole_hook_sockets.stub.php" />
+            <file role="src" name="ext-src/swoole_hook_sockets_arginfo.h" />
             <file role="src" name="ext-src/swoole_http2_client_coro.cc" />
             <file role="src" name="ext-src/swoole_http2_server.cc" />
             <file role="src" name="ext-src/swoole_http_client_coro.cc" />
@@ -733,7 +735,6 @@
             <file role="test" name="tests/include/config.php" />
             <file role="test" name="tests/include/functions.php" />
             <file role="test" name="tests/include/lib/composer.json" />
-            <file role="test" name="tests/include/lib/composer.lock" />
             <file role="test" name="tests/include/lib/src/Assert.php" />
             <file role="test" name="tests/include/lib/src/CoServer.php" />
             <file role="test" name="tests/include/lib/src/CurlManager.php" />
@@ -779,6 +780,7 @@
             <file role="test" name="tests/include/ssl_certs/sni_server_us_key.pem" />
             <file role="test" name="tests/init" />
             <file role="test" name="tests/new" />
+            <file role="test" name="tests/php-cs-fixer" />
             <file role="test" name="tests/run-tests" />
             <file role="test" name="tests/start.sh" />
             <file role="test" name="tests/swoole_atomic/atomic.phpt" />
@@ -1089,6 +1091,7 @@
             <file role="test" name="tests/swoole_curl/close_before_resume.phpt" />
             <file role="test" name="tests/swoole_curl/concurrent.phpt" />
             <file role="test" name="tests/swoole_curl/error.phpt" />
+            <file role="test" name="tests/swoole_curl/event_exit.phpt" />
             <file role="test" name="tests/swoole_curl/exec_twice.phpt" />
             <file role="test" name="tests/swoole_curl/guzzle.phpt" />
             <file role="test" name="tests/swoole_curl/guzzle/cancel.phpt" />
@@ -1141,6 +1144,7 @@
             <file role="test" name="tests/swoole_curl/setopt/nobody.phpt" />
             <file role="test" name="tests/swoole_curl/sleep.phpt" />
             <file role="test" name="tests/swoole_curl/ssl/version.phpt" />
+            <file role="test" name="tests/swoole_curl/symfony-noco.phpt" />
             <file role="test" name="tests/swoole_curl/symfony.phpt" />
             <file role="test" name="tests/swoole_curl/template" />
             <file role="test" name="tests/swoole_curl/timer_coredump.phpt" />
@@ -1643,6 +1647,54 @@
             <file role="test" name="tests/swoole_runtime/set_hook_flags.phpt" />
             <file role="test" name="tests/swoole_runtime/sleep.phpt" />
             <file role="test" name="tests/swoole_runtime/sleep_yield.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/bug46360.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/bug49341.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/bug63000.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/bug76839.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/ipv4loop.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/ipv6_skipif.inc" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/ipv6loop.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/mcast_helpers.php.inc" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/mcast_ipv4_recv.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/mcast_ipv4_send.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/mcast_ipv4_send_error.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/mcast_ipv6_recv.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/mcast_ipv6_recv_limited.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/mcast_ipv6_send.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_accept_failure.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_bind.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_clear_error.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_connect_params.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_create_listen-nobind.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_create_listen.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_create_listen_used.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_create_pair.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_getopt.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_getpeername.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_getpeername_ipv4loop.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_getpeername_ipv6loop.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_getsockname.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_listen-wrongparams.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_read_params.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_select-wrongparams-2.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_select.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_select_error.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_ipv4_udp.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_ipv6_udp.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_unix.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_block-retval.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_nonblock-retval.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_nonblock.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_option_bindtodevice.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_option_error_socket_option.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_option_in6_pktinfo.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_option_rcvtimeo.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_option_seolinger.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_option_sndtimeo.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_setopt_basic.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_shutdown.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/socket_strerror.phpt" />
+            <file role="test" name="tests/swoole_runtime/sockets/basic/unixloop.phpt" />
             <file role="test" name="tests/swoole_runtime/sockets/error.phpt" />
             <file role="test" name="tests/swoole_runtime/sockets/get_name.phpt" />
             <file role="test" name="tests/swoole_runtime/sockets/nonblock.phpt" />
diff --git a/tests/swoole_runtime/sockets/basic/bug46360.phpt b/tests/swoole_runtime/sockets/basic/bug46360.phpt
index c4260fbc50e..cbc0e2f93f5 100644
--- a/tests/swoole_runtime/sockets/basic/bug46360.phpt
+++ b/tests/swoole_runtime/sockets/basic/bug46360.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Bug 46360 - TCP_NODELAY constant (sock_get_option, sock_set_option)
+swoole_runtime/sockets/basic: Bug 46360 - TCP_NODELAY constant (sock_get_option, sock_set_option)
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php if (!extension_loaded('sockets')) die('skip sockets extension not loaded'); ?>
 --CREDITS--
 Florian Anderiasch
diff --git a/tests/swoole_runtime/sockets/basic/bug49341.phpt b/tests/swoole_runtime/sockets/basic/bug49341.phpt
index 6dd497a15ef..4e12d5c2b0c 100644
--- a/tests/swoole_runtime/sockets/basic/bug49341.phpt
+++ b/tests/swoole_runtime/sockets/basic/bug49341.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Bug #49341: add SO_REUSEPORT support for socket_set_option()
+swoole_runtime/sockets/basic: add SO_REUSEPORT support for socket_set_option()
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/bug63000.phpt b/tests/swoole_runtime/sockets/basic/bug63000.phpt
index ebf0cb3a3ce..f78059179aa 100644
--- a/tests/swoole_runtime/sockets/basic/bug63000.phpt
+++ b/tests/swoole_runtime/sockets/basic/bug63000.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Bug #63000: Multicast on OSX
+swoole_runtime/sockets/basic: Multicast on OSX
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/bug76839.phpt b/tests/swoole_runtime/sockets/basic/bug76839.phpt
index c672d96f3ab..6f168fa1e6a 100644
--- a/tests/swoole_runtime/sockets/basic/bug76839.phpt
+++ b/tests/swoole_runtime/sockets/basic/bug76839.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Bug #76839: socket_recvfrom may return an invalid 'from' address on MacOS
+swoole_runtime/sockets/basic: socket_recvfrom may return an invalid 'from' address on MacOS
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (strtolower(substr(PHP_OS, 0, 3)) === 'win') {
     die('skip not valid for Windows.');
diff --git a/tests/swoole_runtime/sockets/basic/ipv4loop.phpt b/tests/swoole_runtime/sockets/basic/ipv4loop.phpt
index b18e73f1659..ef1412e662f 100644
--- a/tests/swoole_runtime/sockets/basic/ipv4loop.phpt
+++ b/tests/swoole_runtime/sockets/basic/ipv4loop.phpt
@@ -1,6 +1,7 @@
 --TEST--
-IPv4 Loopback test
+swoole_runtime/sockets/basic: IPv4 Loopback test
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
     if (!extension_loaded('sockets')) {
         die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/ipv6loop.phpt b/tests/swoole_runtime/sockets/basic/ipv6loop.phpt
index 18ed966d6cb..ebd6e7546b0 100644
--- a/tests/swoole_runtime/sockets/basic/ipv6loop.phpt
+++ b/tests/swoole_runtime/sockets/basic/ipv6loop.phpt
@@ -1,6 +1,7 @@
 --TEST--
-IPv6 Loopback test
+swoole_runtime/sockets/basic: IPv6 Loopback test
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
     if (!extension_loaded('sockets')) {
         die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/mcast_ipv4_recv.phpt b/tests/swoole_runtime/sockets/basic/mcast_ipv4_recv.phpt
index 3ac040591bc..1a8798ae4dc 100644
--- a/tests/swoole_runtime/sockets/basic/mcast_ipv4_recv.phpt
+++ b/tests/swoole_runtime/sockets/basic/mcast_ipv4_recv.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Multicast support: IPv4 receive options
+swoole_runtime/sockets/basic: IPv4 receive options
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/mcast_ipv4_send.phpt b/tests/swoole_runtime/sockets/basic/mcast_ipv4_send.phpt
index 3aaa55c5e77..ac744f5e09e 100644
--- a/tests/swoole_runtime/sockets/basic/mcast_ipv4_send.phpt
+++ b/tests/swoole_runtime/sockets/basic/mcast_ipv4_send.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Multicast support: IPv4 send options
+swoole_runtime/sockets/basic: IPv4 send options
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/mcast_ipv4_send_error.phpt b/tests/swoole_runtime/sockets/basic/mcast_ipv4_send_error.phpt
index 643820922d0..be951940328 100644
--- a/tests/swoole_runtime/sockets/basic/mcast_ipv4_send_error.phpt
+++ b/tests/swoole_runtime/sockets/basic/mcast_ipv4_send_error.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Multicast support: IPv4 send options with unusual values
+swoole_runtime/sockets/basic: IPv4 send options with unusual values
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/mcast_ipv6_recv.phpt b/tests/swoole_runtime/sockets/basic/mcast_ipv6_recv.phpt
index 37fe21b6da9..447607b0156 100644
--- a/tests/swoole_runtime/sockets/basic/mcast_ipv6_recv.phpt
+++ b/tests/swoole_runtime/sockets/basic/mcast_ipv6_recv.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Multicast support: IPv6 receive options
+swoole_runtime/sockets/basic: IPv6 receive options
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/mcast_ipv6_recv_limited.phpt b/tests/swoole_runtime/sockets/basic/mcast_ipv6_recv_limited.phpt
index 0637a79b015..ba548d012fe 100644
--- a/tests/swoole_runtime/sockets/basic/mcast_ipv6_recv_limited.phpt
+++ b/tests/swoole_runtime/sockets/basic/mcast_ipv6_recv_limited.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Multicast support: IPv6 receive options (limited)
+swoole_runtime/sockets/basic: IPv6 receive options (limited)
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/mcast_ipv6_send.phpt b/tests/swoole_runtime/sockets/basic/mcast_ipv6_send.phpt
index 2823508cd60..2582076d725 100644
--- a/tests/swoole_runtime/sockets/basic/mcast_ipv6_send.phpt
+++ b/tests/swoole_runtime/sockets/basic/mcast_ipv6_send.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Multicast support: IPv6 send options
+swoole_runtime/sockets/basic: IPv6 send options
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_accept_failure.phpt b/tests/swoole_runtime/sockets/basic/socket_accept_failure.phpt
index 0fce49a2258..c3e233a791d 100644
--- a/tests/swoole_runtime/sockets/basic/socket_accept_failure.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_accept_failure.phpt
@@ -1,5 +1,7 @@
 --TEST--
-socket_accept() failure
+swoole_runtime/sockets/basic: socket_accept() failure
+--SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 --FILE--
 <?php
 use Swoole\Runtime;
diff --git a/tests/swoole_runtime/sockets/basic/socket_bind.phpt b/tests/swoole_runtime/sockets/basic/socket_bind.phpt
index 62853ec6477..57d700d980b 100644
--- a/tests/swoole_runtime/sockets/basic/socket_bind.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_bind.phpt
@@ -1,9 +1,10 @@
 --TEST--
-ext/sockets - socket_bind - basic test
+swoole_runtime/sockets/basic: ext/sockets - socket_bind - basic test
 --CREDITS--
 Florian Anderiasch
 fa@php.net
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
     if (!extension_loaded('sockets')) {
         die('skip - sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_clear_error.phpt b/tests/swoole_runtime/sockets/basic/socket_clear_error.phpt
index e2d56cce138..86e4484ec7b 100644
--- a/tests/swoole_runtime/sockets/basic/socket_clear_error.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_clear_error.phpt
@@ -1,8 +1,9 @@
 --TEST--
-void socket_clear_error ([ resource $socket ] ) ;
+swoole_runtime/sockets/basic: void socket_clear_error ([ resource $socket ] ) ;
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
   die('SKIP sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_connect_params.phpt b/tests/swoole_runtime/sockets/basic/socket_connect_params.phpt
index 5a698d99816..4a5691d5f47 100644
--- a/tests/swoole_runtime/sockets/basic/socket_connect_params.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_connect_params.phpt
@@ -1,9 +1,10 @@
 --TEST--
-ext/sockets - socket_connect - test with empty parameters
+swoole_runtime/sockets/basic: ext/sockets - socket_connect - test with empty parameters
 --CREDITS--
 Florian Anderiasch
 fa@php.net
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
     if (!extension_loaded('sockets')) {
         die('skip - sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_create_listen-nobind.phpt b/tests/swoole_runtime/sockets/basic/socket_create_listen-nobind.phpt
index 886511426d2..ab99680c9ef 100644
--- a/tests/swoole_runtime/sockets/basic/socket_create_listen-nobind.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_create_listen-nobind.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Test if socket_create_listen() returns false, when it cannot bind to the port.
+swoole_runtime/sockets/basic: Test if socket_create_listen() returns false, when it cannot bind to the port.
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
@@ -31,4 +32,3 @@ run(function () {
 });
 ?>
 --EXPECT--
-
diff --git a/tests/swoole_runtime/sockets/basic/socket_create_listen.phpt b/tests/swoole_runtime/sockets/basic/socket_create_listen.phpt
index 2c20619061e..ea772c5a269 100644
--- a/tests/swoole_runtime/sockets/basic/socket_create_listen.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_create_listen.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Test if socket binds on 31338
+swoole_runtime/sockets/basic: Test if socket binds on 31338
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
diff --git a/tests/swoole_runtime/sockets/basic/socket_create_listen_used.phpt b/tests/swoole_runtime/sockets/basic/socket_create_listen_used.phpt
index c2574715334..9a044229ba3 100644
--- a/tests/swoole_runtime/sockets/basic/socket_create_listen_used.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_create_listen_used.phpt
@@ -1,9 +1,10 @@
 --TEST--
-ext/sockets - socket_create_listen - test for used socket
+swoole_runtime/sockets/basic: ext/sockets - socket_create_listen - test for used socket
 --CREDITS--
 Florian Anderiasch
 fa@php.net
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
     if (!extension_loaded('sockets')) {
         die('skip - sockets extension not available.');
@@ -30,4 +31,3 @@ run(function () {
 });
 ?>
 --EXPECT--
-
diff --git a/tests/swoole_runtime/sockets/basic/socket_create_pair.phpt b/tests/swoole_runtime/sockets/basic/socket_create_pair.phpt
index 8591a8330a7..88cf90558c9 100644
--- a/tests/swoole_runtime/sockets/basic/socket_create_pair.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_create_pair.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Test for socket_create_pair()
+swoole_runtime/sockets/basic: Test for socket_create_pair()
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_getopt.phpt b/tests/swoole_runtime/sockets/basic/socket_getopt.phpt
index 908bd2d951a..a8d04f299e6 100644
--- a/tests/swoole_runtime/sockets/basic/socket_getopt.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_getopt.phpt
@@ -1,9 +1,10 @@
 --TEST--
-mixed socket_getopt( resource $socket , int $level , int $optname ) ;
+swoole_runtime/sockets/basic: mixed socket_getopt( resource $socket , int $level , int $optname ) ;
 --CREDITS--
 marcosptf -
 <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
@@ -61,7 +62,6 @@ run(function () {
     unset($r);
 });
 ?>
-
 --EXPECT--
 Setting IP_MULTICAST_TTL
 bool(true)
diff --git a/tests/swoole_runtime/sockets/basic/socket_getpeername.phpt b/tests/swoole_runtime/sockets/basic/socket_getpeername.phpt
index e292a964ae0..45c8f2531a8 100644
--- a/tests/swoole_runtime/sockets/basic/socket_getpeername.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_getpeername.phpt
@@ -1,9 +1,10 @@
 --TEST--
-ext/sockets - socket_getpeername - basic test
+swoole_runtime/sockets/basic: ext/sockets - socket_getpeername - basic test
 --CREDITS--
 Florian Anderiasch
 fa@php.net
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
     if (!extension_loaded('sockets')) {
         die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_getpeername_ipv4loop.phpt b/tests/swoole_runtime/sockets/basic/socket_getpeername_ipv4loop.phpt
index e65701814a4..6edd68625e7 100644
--- a/tests/swoole_runtime/sockets/basic/socket_getpeername_ipv4loop.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_getpeername_ipv4loop.phpt
@@ -1,9 +1,10 @@
 --TEST--
-ext/sockets - socket_getpeername_ipv4loop - basic test
+swoole_runtime/sockets/basic: ext/sockets - socket_getpeername_ipv4loop - basic test
 --CREDITS--
 Tatjana Andersen tatjana.andersen@redpill-linpro.com
 # TestFest 2009 - NorwayUG
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
         if (!extension_loaded('sockets')) {
                 die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_getpeername_ipv6loop.phpt b/tests/swoole_runtime/sockets/basic/socket_getpeername_ipv6loop.phpt
index 320e5e5532d..0229be02ad2 100644
--- a/tests/swoole_runtime/sockets/basic/socket_getpeername_ipv6loop.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_getpeername_ipv6loop.phpt
@@ -1,9 +1,10 @@
 --TEST--
-ext/sockets - socket_getpeername_ipv6loop - basic test
+swoole_runtime/sockets/basic: ext/sockets - socket_getpeername_ipv6loop - basic test
 --CREDITS--
 Tatjana Andersen tatjana.andersen@redpill-linpro.com
 # TestFest 2009 - NorwayUG
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_getsockname.phpt b/tests/swoole_runtime/sockets/basic/socket_getsockname.phpt
index 2e1d70157ac..65ea85a660a 100644
--- a/tests/swoole_runtime/sockets/basic/socket_getsockname.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_getsockname.phpt
@@ -1,9 +1,10 @@
 --TEST--
-ext/sockets - socket_getsockname - basic test
+swoole_runtime/sockets/basic: ext/sockets - socket_getsockname - basic test
 --CREDITS--
 Florian Anderiasch
 fa@php.net
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
     if (!extension_loaded('sockets')) {
         die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_listen-wrongparams.phpt b/tests/swoole_runtime/sockets/basic/socket_listen-wrongparams.phpt
index 0fbf3daa561..37ddb9eafd0 100644
--- a/tests/swoole_runtime/sockets/basic/socket_listen-wrongparams.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_listen-wrongparams.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Test parameter handling in socket_listen().
+swoole_runtime/sockets/basic: Test parameter handling in socket_listen().
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
diff --git a/tests/swoole_runtime/sockets/basic/socket_read_params.phpt b/tests/swoole_runtime/sockets/basic/socket_read_params.phpt
index aef7bd26c60..b43477ea57f 100644
--- a/tests/swoole_runtime/sockets/basic/socket_read_params.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_read_params.phpt
@@ -1,9 +1,10 @@
 --TEST--
-ext/sockets - socket_read- test with incorrect parameter
+swoole_runtime/sockets/basic: ext/sockets - socket_read- test with incorrect parameter
 --CREDITS--
 Florian Anderiasch
 fa@php.net
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_select-wrongparams-2.phpt b/tests/swoole_runtime/sockets/basic/socket_select-wrongparams-2.phpt
index c38809990b3..8e653310222 100644
--- a/tests/swoole_runtime/sockets/basic/socket_select-wrongparams-2.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_select-wrongparams-2.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Test parameter handling in socket_select().
+swoole_runtime/sockets/basic: Test parameter handling in socket_select().
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_select.phpt b/tests/swoole_runtime/sockets/basic/socket_select.phpt
index c3bffe16468..561a862c859 100644
--- a/tests/swoole_runtime/sockets/basic/socket_select.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_select.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Test parameter handling in socket_select().
+swoole_runtime/sockets/basic: Test parameter handling in socket_select().
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_select_error.phpt b/tests/swoole_runtime/sockets/basic/socket_select_error.phpt
index 5c993e107e9..b9d5fcfdb72 100644
--- a/tests/swoole_runtime/sockets/basic/socket_select_error.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_select_error.phpt
@@ -1,6 +1,7 @@
 --TEST--
-socket_select() error conditions
+swoole_runtime/sockets/basic: socket_select() error conditions
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) die('skip socket extension not available');
 die('skip unsupport');
diff --git a/tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_ipv4_udp.phpt b/tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_ipv4_udp.phpt
index 2f7eb369979..aec95f69eda 100644
--- a/tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_ipv4_udp.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_ipv4_udp.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Test if socket_recvfrom() receives data sent by socket_sendto() via IPv4 UDP
+swoole_runtime/sockets/basic: Test if socket_recvfrom() receives data sent by socket_sendto() via IPv4 UDP
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_ipv6_udp.phpt b/tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_ipv6_udp.phpt
index 86824c6a2dd..73223eec103 100644
--- a/tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_ipv6_udp.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_ipv6_udp.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Test if socket_recvfrom() receives data sent by socket_sendto() via IPv6 UDP
+swoole_runtime/sockets/basic: Test if socket_recvfrom() receives data sent by socket_sendto() via IPv6 UDP
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_unix.phpt b/tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_unix.phpt
index 239557a72e1..239a804f5a3 100644
--- a/tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_unix.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_unix.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Test if socket_recvfrom() receives data sent by socket_sendto() through a Unix domain socket
+swoole_runtime/sockets/basic: Test if socket_recvfrom() receives data sent by socket_sendto() through a Unix domain socket
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
diff --git a/tests/swoole_runtime/sockets/basic/socket_set_block-retval.phpt b/tests/swoole_runtime/sockets/basic/socket_set_block-retval.phpt
index 3a38e3e46a8..38e12d5cf0d 100644
--- a/tests/swoole_runtime/sockets/basic/socket_set_block-retval.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_set_block-retval.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Test socket_set_block return values
+swoole_runtime/sockets/basic: Test socket_set_block return values
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_set_nonblock-retval.phpt b/tests/swoole_runtime/sockets/basic/socket_set_nonblock-retval.phpt
index 641f28e1296..1e3d62f4187 100644
--- a/tests/swoole_runtime/sockets/basic/socket_set_nonblock-retval.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_set_nonblock-retval.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Test socket_set_nonblock return values
+swoole_runtime/sockets/basic: Test socket_set_nonblock return values
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_set_nonblock.phpt b/tests/swoole_runtime/sockets/basic/socket_set_nonblock.phpt
index 85f49dbbe90..78e808f2b0d 100644
--- a/tests/swoole_runtime/sockets/basic/socket_set_nonblock.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_set_nonblock.phpt
@@ -1,9 +1,10 @@
 --TEST--
-ext/sockets - socket_set_block - basic test
+swoole_runtime/sockets/basic: ext/sockets - socket_set_block - basic test
 --CREDITS--
 Florian Anderiasch
 fa@php.net
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
     if (!extension_loaded('sockets')) {
         die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_set_option_bindtodevice.phpt b/tests/swoole_runtime/sockets/basic/socket_set_option_bindtodevice.phpt
index 87099ef254b..6aa20d1fe88 100644
--- a/tests/swoole_runtime/sockets/basic/socket_set_option_bindtodevice.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_set_option_bindtodevice.phpt
@@ -1,9 +1,10 @@
 --TEST--
-Test if socket_set_option() works, option:SO_BINDTODEVICE
+swoole_runtime/sockets/basic:SO_BINDTODEVICE
 --DESCRIPTION--
 -Bind to loopback 'lo' device (should exist)
 -Bind to unexisting device
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
         die('SKIP sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_set_option_error_socket_option.phpt b/tests/swoole_runtime/sockets/basic/socket_set_option_error_socket_option.phpt
index 30f4eefad9e..2a6665f0d2a 100644
--- a/tests/swoole_runtime/sockets/basic/socket_set_option_error_socket_option.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_set_option_error_socket_option.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Test if socket_set_option() returns 'Unable to set socket option' failure for invalid options
+swoole_runtime/sockets/basic: Test if socket_set_option() returns 'Unable to set socket option' failure for invalid options
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('SKIP sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_set_option_in6_pktinfo.phpt b/tests/swoole_runtime/sockets/basic/socket_set_option_in6_pktinfo.phpt
index e9a66abfc5e..2ce3690ea9d 100644
--- a/tests/swoole_runtime/sockets/basic/socket_set_option_in6_pktinfo.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_set_option_in6_pktinfo.phpt
@@ -1,6 +1,7 @@
 --TEST--
-socket_set_option() with IPV6_PKTINFO
+swoole_runtime/sockets/basic: socket_set_option() with IPV6_PKTINFO
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_set_option_rcvtimeo.phpt b/tests/swoole_runtime/sockets/basic/socket_set_option_rcvtimeo.phpt
index 67fb22297e0..874db4f9039 100644
--- a/tests/swoole_runtime/sockets/basic/socket_set_option_rcvtimeo.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_set_option_rcvtimeo.phpt
@@ -1,9 +1,10 @@
 --TEST--
-Test if socket_set_option() works, option:SO_RCVTIMEO
+swoole_runtime/sockets/basic:SO_RCVTIMEO
 --DESCRIPTION--
 -wrong params
 -set/get params comparison
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('SKIP sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_set_option_seolinger.phpt b/tests/swoole_runtime/sockets/basic/socket_set_option_seolinger.phpt
index 7dbbf6e3f00..1e4f44528e5 100644
--- a/tests/swoole_runtime/sockets/basic/socket_set_option_seolinger.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_set_option_seolinger.phpt
@@ -1,10 +1,11 @@
 --TEST--
-Test if socket_set_option() works, option:SO_SEOLINGER
+swoole_runtime/sockets/basic:SO_SEOLINGER
 --DESCRIPTION--
 -wrong params
 -set/get params comparison
 -l_linger not given
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('SKIP sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_set_option_sndtimeo.phpt b/tests/swoole_runtime/sockets/basic/socket_set_option_sndtimeo.phpt
index 6e0ada7d6fc..2e84bdeeeb0 100644
--- a/tests/swoole_runtime/sockets/basic/socket_set_option_sndtimeo.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_set_option_sndtimeo.phpt
@@ -1,9 +1,10 @@
 --TEST--
-Test if socket_set_option() works, option:SO_SNDTIMEO
+swoole_runtime/sockets/basic:SO_SNDTIMEO
 --DESCRIPTION--
 -wrong params
 -set/get params comparison
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
         die('SKIP sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_setopt_basic.phpt b/tests/swoole_runtime/sockets/basic/socket_setopt_basic.phpt
index 5e223e28823..e39498e4252 100644
--- a/tests/swoole_runtime/sockets/basic/socket_setopt_basic.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_setopt_basic.phpt
@@ -1,9 +1,10 @@
 --TEST--
-Test socket_setopt() basic functionality
+swoole_runtime/sockets/basic: Test socket_setopt() basic functionality
 --CREDITS--
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 User Group: PHPSP #PHPTestFestBrasil
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip. Sockets extension is not available.');
diff --git a/tests/swoole_runtime/sockets/basic/socket_shutdown.phpt b/tests/swoole_runtime/sockets/basic/socket_shutdown.phpt
index 3e62adb7ccb..80992250e1d 100644
--- a/tests/swoole_runtime/sockets/basic/socket_shutdown.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_shutdown.phpt
@@ -1,8 +1,9 @@
 --TEST--
-bool socket_shutdown ( resource $socket [, int $how = 2 ] ) ;
+swoole_runtime/sockets/basic: bool socket_shutdown ( resource $socket [, int $how = 2 ] ) ;
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
 if (!extension_loaded('sockets')) {
diff --git a/tests/swoole_runtime/sockets/basic/socket_strerror.phpt b/tests/swoole_runtime/sockets/basic/socket_strerror.phpt
index b281cfa145b..4884d36d55c 100644
--- a/tests/swoole_runtime/sockets/basic/socket_strerror.phpt
+++ b/tests/swoole_runtime/sockets/basic/socket_strerror.phpt
@@ -1,9 +1,10 @@
 --TEST--
-ext/sockets - socket_strerror - basic test
+swoole_runtime/sockets/basic: ext/sockets - socket_strerror - basic test
 --CREDITS--
 Florian Anderiasch
 fa@php.net
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
diff --git a/tests/swoole_runtime/sockets/basic/unixloop.phpt b/tests/swoole_runtime/sockets/basic/unixloop.phpt
index cf1abfd872b..e9100fbbc8e 100644
--- a/tests/swoole_runtime/sockets/basic/unixloop.phpt
+++ b/tests/swoole_runtime/sockets/basic/unixloop.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Unix domain socket Loopback test
+swoole_runtime/sockets/basic: Unix domain socket Loopback test
 --SKIPIF--
+<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');