You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/02/25 21:02:54 UTC
[incubator-nuttx-apps] branch pr100 updated: Revert "examples:
usrsocktest: Fix errors in NoBlockRecv and BlockRecv tests"
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch pr100
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/pr100 by this push:
new 16dc851 Revert "examples: usrsocktest: Fix errors in NoBlockRecv and BlockRecv tests"
16dc851 is described below
commit 16dc8518894534eaecedf76ca21298489f5f25b4
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Feb 25 23:49:53 2020 +0800
Revert "examples: usrsocktest: Fix errors in NoBlockRecv and BlockRecv tests"
This reverts commit 10c715d9215a7fbc6bc5000f10169c128af11854.
---
examples/usrsocktest/usrsocktest_block_recv.c | 6 ++----
examples/usrsocktest/usrsocktest_noblock_recv.c | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/examples/usrsocktest/usrsocktest_block_recv.c b/examples/usrsocktest/usrsocktest_block_recv.c
index d7a5a00..54827d7 100644
--- a/examples/usrsocktest/usrsocktest_block_recv.c
+++ b/examples/usrsocktest/usrsocktest_block_recv.c
@@ -265,8 +265,7 @@ static void NoBlockConnect(FAR struct usrsocktest_daemon_conf_s *dconf)
TEST_ASSERT_EQUAL(1, ret);
TEST_ASSERT_EQUAL_UINT8_ARRAY("a", data, 1);
TEST_ASSERT_EQUAL(sizeof(remoteaddr), addrlen);
- TEST_ASSERT_EQUAL_UINT8_ARRAY(&remoteaddr, &addr,
- addrlen - sizeof(addr.sin_zero));
+ TEST_ASSERT_EQUAL_UINT8_ARRAY(&remoteaddr, &addr, addrlen);
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_connected_sockets());
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_active_sockets());
TEST_ASSERT_EQUAL(6, usrsocktest_daemon_get_recv_bytes());
@@ -283,8 +282,7 @@ static void NoBlockConnect(FAR struct usrsocktest_daemon_conf_s *dconf)
TEST_ASSERT_EQUAL(5, ret);
TEST_ASSERT_EQUAL_UINT8_ARRAY("abcde", data, 5);
TEST_ASSERT_EQUAL(sizeof(remoteaddr), addrlen);
- TEST_ASSERT_EQUAL_UINT8_ARRAY(&remoteaddr, &addr,
- addrlen - sizeof(addr.sin_zero));
+ TEST_ASSERT_EQUAL_UINT8_ARRAY(&remoteaddr, &addr, addrlen);
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_connected_sockets());
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_active_sockets());
TEST_ASSERT_EQUAL(11, usrsocktest_daemon_get_recv_bytes());
diff --git a/examples/usrsocktest/usrsocktest_noblock_recv.c b/examples/usrsocktest/usrsocktest_noblock_recv.c
index 4afccbb..2e51179 100644
--- a/examples/usrsocktest/usrsocktest_noblock_recv.c
+++ b/examples/usrsocktest/usrsocktest_noblock_recv.c
@@ -197,8 +197,7 @@ static void Receive(struct usrsocktest_daemon_conf_s *dconf)
TEST_ASSERT_EQUAL(3, ret);
TEST_ASSERT_EQUAL_UINT8_ARRAY("abc", data, 3);
TEST_ASSERT_EQUAL(addrlen, sizeof(remoteaddr));
- TEST_ASSERT_EQUAL_UINT8_ARRAY(&remoteaddr, &addr,
- addrlen - sizeof(addr.sin_zero));
+ TEST_ASSERT_EQUAL_UINT8_ARRAY(&remoteaddr, &addr, addrlen);
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_connected_sockets());
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_active_sockets());
TEST_ASSERT_EQUAL(datalen + ret, usrsocktest_daemon_get_recv_bytes());