test(windows): adapt portable PHPT fixtures --filter=[win-unit]

Author: matyhtf

.github/workflows/windows.yml

@@ -130,6 +130,14 @@ jobs:
         run: |
           & .github\workflows\windows-phpt.ps1 -Path tests\swoole_coroutine_util -TimeoutSeconds 12
 
+      - name: Run Windows coroutine system tests
+        id: coroutine-system
+        continue-on-error: true
+        timeout-minutes: 2
+        shell: powershell
+        run: |
+          & .github\workflows\windows-phpt.ps1 -Path tests\swoole_coroutine_system -TimeoutSeconds 12
+
       - name: Run Windows timer and event tests
         id: timer-event
         continue-on-error: true
@@ -193,6 +201,7 @@ jobs:
             '${{ steps.channel-lock.outcome }}',
             '${{ steps.scheduler.outcome }}',
             '${{ steps.coroutine-util.outcome }}',
+            '${{ steps.coroutine-system.outcome }}',
             '${{ steps.timer-event.outcome }}',
             '${{ steps.iocp-socket-1.outcome }}',
             '${{ steps.iocp-socket-2.outcome }}',

ext-src/swoole_socket_coro.cc

@@ -745,8 +745,32 @@ void php_swoole_socket_coro_minit(int module_number) {
 #endif
 }
 
+static sw_inline int socket_coro_public_error_code(int code) {
+#ifdef _WIN32
+    // ext/sockets exposes Winsock error constants on Windows, while Swoole
+    // uses CRT errno values internally. Keep errCode comparable with the
+    // visible SOCKET_E* constants when both extensions are loaded.
+    if (zend_hash_str_find_ptr(&module_registry, ZEND_STRL("sockets"))) {
+        switch (code) {
+        case EINVAL:
+            return WSAEINVAL;
+        case EBADF:
+            return WSAEBADF;
+        case ENOTCONN:
+            return WSAENOTCONN;
+        default:
+            break;
+        }
+    }
+#endif
+    return code;
+}
+
 static sw_inline void socket_coro_sync_properties(const zval *zobject, const SocketObject *sock) {
-    zend_update_property_long(swoole_socket_coro_ce, SW_Z8_OBJ_P(zobject), ZEND_STRL("errCode"), sock->socket->errCode);
+    zend_update_property_long(swoole_socket_coro_ce,
+                              SW_Z8_OBJ_P(zobject),
+                              ZEND_STRL("errCode"),
+                              socket_coro_public_error_code(sock->socket->errCode));
     zend_update_property_string(swoole_socket_coro_ce, SW_Z8_OBJ_P(zobject), ZEND_STRL("errMsg"), sock->socket->errMsg);
 }
 
@@ -807,6 +831,7 @@ SW_API zend_object *php_swoole_create_socket(swSocketType type) {
 }
 
 SW_API void php_swoole_socket_set_error_properties(const zval *zobject, int code, const char *msg) {
+    code = socket_coro_public_error_code(code);
     swoole_set_last_error(code);
     zend_update_property_long(Z_OBJCE_P(zobject), SW_Z8_OBJ_P(zobject), ZEND_STRL("errCode"), code);
     zend_update_property_string(Z_OBJCE_P(zobject), SW_Z8_OBJ_P(zobject), ZEND_STRL("errMsg"), msg);

tests/swoole_coroutine_scheduler/preemptive/timer.phpt

@@ -3,6 +3,7 @@ swoole_coroutine_scheduler/preemptive: child coroutine timer
 --SKIPIF--
 <?php 
 require __DIR__ . '/../../include/skipif.inc';
+skip_if_not_linux();
 ?>
 --FILE--
 <?php

tests/swoole_coroutine_system/wait.phpt

@@ -1,7 +1,10 @@
 --TEST--
 swoole_coroutine_system: wait
 --SKIPIF--
-<?php require __DIR__ . '/../include/skipif.inc'; ?>
+<?php
+require __DIR__ . '/../include/skipif.inc';
+skip_if_win();
+?>
 --FILE--
 <?php
 require __DIR__ . '/../include/bootstrap.php';

tests/swoole_coroutine_system/waitPid.phpt

@@ -1,7 +1,10 @@
 --TEST--
 swoole_coroutine_system: waitPid
 --SKIPIF--
-<?php require __DIR__ . '/../include/skipif.inc'; ?>
+<?php
+require __DIR__ . '/../include/skipif.inc';
+skip_if_win();
+?>
 --FILE--
 <?php
 require __DIR__ . '/../include/bootstrap.php';

tests/swoole_coroutine_system/waitSignal.phpt

@@ -1,7 +1,10 @@
 --TEST--
 swoole_coroutine_system: waitSignal
 --SKIPIF--
-<?php require __DIR__ . '/../include/skipif.inc'; ?>
+<?php
+require __DIR__ . '/../include/skipif.inc';
+skip_if_win();
+?>
 --FILE--
 <?php
 require __DIR__ . '/../include/bootstrap.php';

tests/swoole_coroutine_system/waitSignal_2.phpt

@@ -1,7 +1,10 @@
 --TEST--
 swoole_coroutine_system: waitSignal 2
 --SKIPIF--
-<?php require __DIR__ . '/../include/skipif.inc'; ?>
+<?php
+require __DIR__ . '/../include/skipif.inc';
+skip_if_win();
+?>
 --FILE--
 <?php
 require __DIR__ . '/../include/bootstrap.php';

tests/swoole_coroutine_util/exec.phpt

@@ -3,6 +3,7 @@ swoole_coroutine_util: exec
 --SKIPIF--
 <?php
 require __DIR__ . '/../include/skipif.inc';
+skip_if_win();
 skip_if_command_not_found('md5sum');
 ?>
 --FILE--

tests/swoole_coroutine_util/exec_sleep.phpt

@@ -2,6 +2,7 @@
 swoole_coroutine_util: coroutine exec
 --SKIPIF--
 <?php require __DIR__ . '/../include/skipif.inc';
+skip_if_win();
 ?>
 --FILE--
 <?php

tests/swoole_socket_coro/complete_test.phpt

@@ -11,13 +11,12 @@ use Swoole\Coroutine\Socket;
 use Swoole\Event;
 
 $pm = new ProcessManager();
-$port = get_one_free_port();
-$pm->parentFunc = function ($pid) use ($pm, $port) {
+$pm->parentFunc = function ($pid) use ($pm) {
     $socket = new Socket(AF_INET, SOCK_STREAM, 0);
     Assert::isInstanceOf($socket, Socket::class);
     Assert::same($socket->errCode, 0);
-    go(function () use ($socket, $port) {
-        Assert::assert($socket->connect('localhost', $port));
+    go(function () use ($socket, $pm) {
+        Assert::assert($socket->connect('localhost', $pm->getFreePort()));
         $i = 0.000;
         while (true) {
             $socket->send('hello');
@@ -35,9 +34,9 @@ $pm->parentFunc = function ($pid) use ($pm, $port) {
     Event::wait();
 };
 
-$pm->childFunc = function () use ($pm, $port) {
+$pm->childFunc = function () use ($pm) {
     $socket = new Socket(AF_INET, SOCK_STREAM, 0);
-    Assert::assert($socket->bind('127.0.0.1', $port));
+    Assert::assert($socket->bind('127.0.0.1', $pm->getFreePort()));
     Assert::assert($socket->listen(128));
     go(function () use ($socket, $pm) {
         $pm->wakeup();