summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
author杨威 <[email protected]>2019-09-11 15:09:54 +0800
committer杨威 <[email protected]>2019-09-11 15:09:54 +0800
commitcacc811248bf4636fe0056221cc615cd31044f16 (patch)
tree15c48e257370aa85f00a615e069201c8d1bc4a8f /test
parent119b3a7677cab82c8c6cefe73284c947abd11ec9 (diff)
1、cmake文件更新,编译条件改为单一变量多选,如捕包模式
2、gitignore文件更新,增加vscode和version.txt
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt2
-rw-r--r--test/test_app_sapp.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f2b67db..509b16d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(${MESA_SDK_PREFIX}/include)
include_directories(${MESA_SDK_PREFIX}/include/MESA)
-if(OPT_IOMODE_MARSIO)
+if(CAPTURE_MODE MATCHES "MARSIO")
include_directories(${MARSIO_SDK_PREFIX}/include)
endif()
diff --git a/test/test_app_sapp.c b/test/test_app_sapp.c
index f1baee7..67ec103 100644
--- a/test/test_app_sapp.c
+++ b/test/test_app_sapp.c
@@ -1443,6 +1443,7 @@ static int send_by_sapp_inject_pkt(struct streaminfo *a_tcp, const struct mesa_i
}
+#if 0
#include "http.h"
char test_sapp_inject_http(stSessionInfo* session_info, void **param, int thread_seq, struct streaminfo *a_tcp, void *a_packet)
{
@@ -1462,6 +1463,7 @@ char test_sapp_inject_http(stSessionInfo* session_info, void **param, int thread
return PROT_STATE_GIVEME;
}
+#endif
char test_sapp_inject_pkt(struct streaminfo *stream,void **pme, int thread_seq,const void *raw_pkt)