提交 9a99501c 编写于 作者: O openharmony_ci 提交者: Gitee

!973 【Openharmony_1.01_release】【communication_lite】继承master修改同步10月的修改lwip_L1模块的文件

Merge pull request !973 from yelin10/myfeature
...@@ -79,6 +79,8 @@ lite_component("acts_component") { ...@@ -79,6 +79,8 @@ lite_component("acts_component") {
"//test/xts/acts/utils_lite/kv_store_posix:ActsKvStoreTest", "//test/xts/acts/utils_lite/kv_store_posix:ActsKvStoreTest",
"//test/xts/acts/startup_lite/syspara_posix:ActsParameterTest", "//test/xts/acts/startup_lite/syspara_posix:ActsParameterTest",
"//test/xts/acts/startup_lite/bootstrap_posix:ActsBootstrapTest", "//test/xts/acts/startup_lite/bootstrap_posix:ActsBootstrapTest",
"//test/xts/acts/communication_lite/lwip_posix:ActsLwipTest",
"//test/xts/acts/security_lite/datahuks_posix:ActsSecurityDataTest", "//test/xts/acts/security_lite/datahuks_posix:ActsSecurityDataTest",
#"//test/xts/acts/multimedia_lite/camera_lite_posix/camera_native:ActsMediaCameraTest", #"//test/xts/acts/multimedia_lite/camera_lite_posix/camera_native:ActsMediaCameraTest",
#"//test/xts/acts/multimedia_lite/media_lite_posix/player_native:ActsMediaPlayerTest", #"//test/xts/acts/multimedia_lite/media_lite_posix/player_native:ActsMediaPlayerTest",
......
...@@ -22,7 +22,13 @@ hcpptest_suite("ActsLwipTest") { ...@@ -22,7 +22,13 @@ hcpptest_suite("ActsLwipTest") {
"restrict=", "restrict=",
] ]
deps = ["//third_party/bounds_checking_function:libsec_shared" ] deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
ldflags = [
"-lstdc++",
"-lm",
"-lpthread",
]
} }
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
*/ */
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "sys/socket.h" #include <sys/socket.h>
#include "arpa/inet.h" #include <arpa/inet.h>
#include "netinet/tcp.h" #include <netinet/tcp.h>
#include "securec.h"
#include <sys/wait.h> #include <sys/wait.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include "securec.h"
using namespace std; using namespace std;
using namespace testing::ext; using namespace testing::ext;
...@@ -413,7 +413,8 @@ static int SelectServerForFork(unsigned int timeoutSec) ...@@ -413,7 +413,8 @@ static int SelectServerForFork(unsigned int timeoutSec)
char dataBuf[50] = {0}; char dataBuf[50] = {0};
int fds[TEST_FD_COUNT] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; int fds[TEST_FD_COUNT] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
fds[0] = srvFd; fds[0] = srvFd;
struct timeval timev = {.tv_sec = timeoutSec, .tv_usec = 0}; long timeout = static_cast<long>(timeoutSec);
struct timeval timev = {.tv_sec = timeout, .tv_usec = 0};
struct sockaddr_in clnAddr = {0}; struct sockaddr_in clnAddr = {0};
socklen_t clnAddrLen = sizeof(clnAddr); socklen_t clnAddrLen = sizeof(clnAddr);
while (1) { while (1) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册