diff mbox series

[44/51] tests/qtest: microbit-test: Fix socket access for win32

Message ID 20220824094029.1634519-45-bmeng.cn@gmail.com (mailing list archive)
State New, archived
Headers show
Series tests/qtest: Enable running qtest on Windows | expand

Commit Message

Bin Meng Aug. 24, 2022, 9:40 a.m. UTC 
From: Bin Meng <bin.meng@windriver.com>

Sockets on Windows do not use *nix-style file descriptors, so
write()/read()/close() do not work on Windows.

Switch over to use send()/recv()/closesocket() which work with
sockets on all platforms.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
---

 tests/qtest/microbit-test.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Marc-André Lureau Sept. 1, 2022, 11:44 a.m. UTC | #1 
On Wed, Aug 24, 2022 at 3:27 PM Bin Meng <bmeng.cn@gmail.com> wrote:

> From: Bin Meng <bin.meng@windriver.com>
>
> Sockets on Windows do not use *nix-style file descriptors, so
> write()/read()/close() do not work on Windows.
>
> Switch over to use send()/recv()/closesocket() which work with
> sockets on all platforms.
>
> Signed-off-by: Bin Meng <bin.meng@windriver.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>
>  tests/qtest/microbit-test.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tests/qtest/microbit-test.c b/tests/qtest/microbit-test.c
> index b71daae9a9..4bc267020b 100644
> --- a/tests/qtest/microbit-test.c
> +++ b/tests/qtest/microbit-test.c
> @@ -51,7 +51,7 @@ static void uart_rw_to_rxd(QTestState *qts, int sock_fd,
> const char *in,
>  {
>      int i, in_len = strlen(in);
>
> -    g_assert_true(write(sock_fd, in, in_len) == in_len);
> +    g_assert_true(send(sock_fd, in, in_len, 0) == in_len);
>      for (i = 0; i < in_len; i++) {
>          g_assert_true(uart_wait_for_event(qts, NRF51_UART_BASE +
>                                                 A_UART_RXDRDY));
> @@ -77,7 +77,7 @@ static void test_nrf51_uart(void)
>      char s[10];
>      QTestState *qts = qtest_init_with_serial("-M microbit", &sock_fd);
>
> -    g_assert_true(write(sock_fd, "c", 1) == 1);
> +    g_assert_true(send(sock_fd, "c", 1, 0) == 1);
>      g_assert_cmphex(qtest_readl(qts, NRF51_UART_BASE + A_UART_RXD), ==,
> 0x00);
>
>      qtest_writel(qts, NRF51_UART_BASE + A_UART_ENABLE, 0x04);
> @@ -97,17 +97,17 @@ static void test_nrf51_uart(void)
>
>      qtest_writel(qts, NRF51_UART_BASE + A_UART_STARTTX, 0x01);
>      uart_w_to_txd(qts, "d");
> -    g_assert_true(read(sock_fd, s, 10) == 1);
> +    g_assert_true(recv(sock_fd, s, 10, 0) == 1);
>      g_assert_cmphex(s[0], ==, 'd');
>
>      qtest_writel(qts, NRF51_UART_BASE + A_UART_SUSPEND, 0x01);
>      qtest_writel(qts, NRF51_UART_BASE + A_UART_TXD, 'h');
>      qtest_writel(qts, NRF51_UART_BASE + A_UART_STARTTX, 0x01);
>      uart_w_to_txd(qts, "world");
> -    g_assert_true(read(sock_fd, s, 10) == 5);
> +    g_assert_true(recv(sock_fd, s, 10, 0) == 5);
>      g_assert_true(memcmp(s, "world", 5) == 0);
>
> -    close(sock_fd);
> +    closesocket(sock_fd);
>
>      qtest_quit(qts);
>  }
> --
> 2.34.1
>
>
>
diff mbox series

Patch

diff --git a/tests/qtest/microbit-test.c b/tests/qtest/microbit-test.c
index b71daae9a9..4bc267020b 100644
--- a/tests/qtest/microbit-test.c
+++ b/tests/qtest/microbit-test.c
@@ -51,7 +51,7 @@  static void uart_rw_to_rxd(QTestState *qts, int sock_fd, const char *in,
 {
     int i, in_len = strlen(in);
 
-    g_assert_true(write(sock_fd, in, in_len) == in_len);
+    g_assert_true(send(sock_fd, in, in_len, 0) == in_len);
     for (i = 0; i < in_len; i++) {
         g_assert_true(uart_wait_for_event(qts, NRF51_UART_BASE +
                                                A_UART_RXDRDY));
@@ -77,7 +77,7 @@  static void test_nrf51_uart(void)
     char s[10];
     QTestState *qts = qtest_init_with_serial("-M microbit", &sock_fd);
 
-    g_assert_true(write(sock_fd, "c", 1) == 1);
+    g_assert_true(send(sock_fd, "c", 1, 0) == 1);
     g_assert_cmphex(qtest_readl(qts, NRF51_UART_BASE + A_UART_RXD), ==, 0x00);
 
     qtest_writel(qts, NRF51_UART_BASE + A_UART_ENABLE, 0x04);
@@ -97,17 +97,17 @@  static void test_nrf51_uart(void)
 
     qtest_writel(qts, NRF51_UART_BASE + A_UART_STARTTX, 0x01);
     uart_w_to_txd(qts, "d");
-    g_assert_true(read(sock_fd, s, 10) == 1);
+    g_assert_true(recv(sock_fd, s, 10, 0) == 1);
     g_assert_cmphex(s[0], ==, 'd');
 
     qtest_writel(qts, NRF51_UART_BASE + A_UART_SUSPEND, 0x01);
     qtest_writel(qts, NRF51_UART_BASE + A_UART_TXD, 'h');
     qtest_writel(qts, NRF51_UART_BASE + A_UART_STARTTX, 0x01);
     uart_w_to_txd(qts, "world");
-    g_assert_true(read(sock_fd, s, 10) == 5);
+    g_assert_true(recv(sock_fd, s, 10, 0) == 5);
     g_assert_true(memcmp(s, "world", 5) == 0);
 
-    close(sock_fd);
+    closesocket(sock_fd);
 
     qtest_quit(qts);
 }