Skip to content

Commit 8e6fd7d

Browse files
hexian000hexian000
committed
build: try fix test targets
Signed-off-by: He Xian <hexian000@outlook.com>
1 parent 9007937 commit 8e6fd7d

2 files changed

Lines changed: 90 additions & 76 deletions

File tree

‎src/CMakeLists.txt‎

Lines changed: 89 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -185,93 +185,95 @@ target_sources(neosocksd
185185

186186
# --- tests ---
187187

188-
add_executable(socks_test
189-
socks_test.c
190-
socks.c
191-
)
192-
target_include_directories(socks_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
193-
target_compile_options(socks_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
194-
target_compile_options(socks_test PRIVATE -pedantic -Wall -Wextra -Werror)
195-
target_link_libraries(socks_test PRIVATE csnippets miniz ${LIBEV_LIBRARY})
196-
if(LIBM)
197-
target_link_libraries(socks_test PRIVATE m)
198-
endif()
188+
if(WITH_RULESET)
189+
add_executable(socks_test
190+
socks_test.c
191+
socks.c
192+
)
193+
target_include_directories(socks_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
194+
target_compile_options(socks_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
195+
target_compile_options(socks_test PRIVATE -pedantic -Wall -Wextra -Werror)
196+
target_link_libraries(socks_test PRIVATE csnippets miniz ${LIBEV_LIBRARY})
197+
if(LIBM)
198+
target_link_libraries(socks_test PRIVATE m)
199+
endif()
199200

200-
if(FORCE_POSIX)
201-
target_compile_definitions(socks_test PRIVATE _POSIX_C_SOURCE=200809L)
202-
else()
203-
target_compile_definitions(socks_test PRIVATE _GNU_SOURCE)
204-
endif()
201+
if(FORCE_POSIX)
202+
target_compile_definitions(socks_test PRIVATE _POSIX_C_SOURCE=200809L)
203+
else()
204+
target_compile_definitions(socks_test PRIVATE _GNU_SOURCE)
205+
endif()
205206

206-
add_test(NAME socks_test COMMAND socks_test)
207+
add_test(NAME socks_test COMMAND socks_test)
207208

208-
add_executable(http_proxy_test
209-
http_proxy_test.c
210-
http_proxy.c
211-
proto/http.c
212-
proto/codec.c
213-
)
214-
target_include_directories(http_proxy_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
215-
target_compile_options(http_proxy_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
216-
target_compile_options(http_proxy_test PRIVATE -pedantic -Wall -Wextra -Werror)
217-
target_link_libraries(http_proxy_test PRIVATE csnippets miniz ${LIBEV_LIBRARY})
218-
if(LIBM)
219-
target_link_libraries(http_proxy_test PRIVATE m)
220-
endif()
209+
add_executable(http_proxy_test
210+
http_proxy_test.c
211+
http_proxy.c
212+
proto/http.c
213+
proto/codec.c
214+
)
215+
target_include_directories(http_proxy_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
216+
target_compile_options(http_proxy_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
217+
target_compile_options(http_proxy_test PRIVATE -pedantic -Wall -Wextra -Werror)
218+
target_link_libraries(http_proxy_test PRIVATE csnippets miniz ${LIBEV_LIBRARY})
219+
if(LIBM)
220+
target_link_libraries(http_proxy_test PRIVATE m)
221+
endif()
221222

222-
if(FORCE_POSIX)
223-
target_compile_definitions(http_proxy_test PRIVATE _POSIX_C_SOURCE=200809L)
224-
else()
225-
target_compile_definitions(http_proxy_test PRIVATE _GNU_SOURCE)
226-
endif()
223+
if(FORCE_POSIX)
224+
target_compile_definitions(http_proxy_test PRIVATE _POSIX_C_SOURCE=200809L)
225+
else()
226+
target_compile_definitions(http_proxy_test PRIVATE _GNU_SOURCE)
227+
endif()
227228

228-
add_test(NAME http_proxy_test COMMAND http_proxy_test)
229+
add_test(NAME http_proxy_test COMMAND http_proxy_test)
229230

230-
add_executable(api_server_test
231-
api_server_test.c
232-
api_server.c
233-
proto/http.c
234-
proto/codec.c
235-
"${CMAKE_CURRENT_BINARY_DIR}/version.c"
236-
)
237-
target_include_directories(api_server_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
238-
target_compile_options(api_server_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
239-
target_compile_options(api_server_test PRIVATE -pedantic -Wall -Wextra -Werror)
240-
target_link_libraries(api_server_test PRIVATE csnippets miniz ${LIBEV_LIBRARY})
241-
if(LIBM)
242-
target_link_libraries(api_server_test PRIVATE m)
243-
endif()
231+
add_executable(api_server_test
232+
api_server_test.c
233+
api_server.c
234+
proto/http.c
235+
proto/codec.c
236+
"${CMAKE_CURRENT_BINARY_DIR}/version.c"
237+
)
238+
target_include_directories(api_server_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
239+
target_compile_options(api_server_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
240+
target_compile_options(api_server_test PRIVATE -pedantic -Wall -Wextra -Werror)
241+
target_link_libraries(api_server_test PRIVATE csnippets miniz ${LIBEV_LIBRARY})
242+
if(LIBM)
243+
target_link_libraries(api_server_test PRIVATE m)
244+
endif()
244245

245-
if(FORCE_POSIX)
246-
target_compile_definitions(api_server_test PRIVATE _POSIX_C_SOURCE=200809L)
247-
else()
248-
target_compile_definitions(api_server_test PRIVATE _GNU_SOURCE)
249-
endif()
246+
if(FORCE_POSIX)
247+
target_compile_definitions(api_server_test PRIVATE _POSIX_C_SOURCE=200809L)
248+
else()
249+
target_compile_definitions(api_server_test PRIVATE _GNU_SOURCE)
250+
endif()
250251

251-
add_test(NAME api_server_test COMMAND api_server_test)
252+
add_test(NAME api_server_test COMMAND api_server_test)
252253

253-
add_executable(api_client_test
254-
api_client_test.c
255-
api_client.c
256-
http_client.c
257-
proto/http.c
258-
proto/codec.c
259-
)
260-
target_include_directories(api_client_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
261-
target_compile_options(api_client_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
262-
target_compile_options(api_client_test PRIVATE -pedantic -Wall -Wextra -Werror)
263-
target_link_libraries(api_client_test PRIVATE csnippets miniz ${LIBEV_LIBRARY})
264-
if(LIBM)
265-
target_link_libraries(api_client_test PRIVATE m)
266-
endif()
254+
add_executable(api_client_test
255+
api_client_test.c
256+
api_client.c
257+
http_client.c
258+
proto/http.c
259+
proto/codec.c
260+
)
261+
target_include_directories(api_client_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
262+
target_compile_options(api_client_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
263+
target_compile_options(api_client_test PRIVATE -pedantic -Wall -Wextra -Werror)
264+
target_link_libraries(api_client_test PRIVATE csnippets miniz ${LIBEV_LIBRARY})
265+
if(LIBM)
266+
target_link_libraries(api_client_test PRIVATE m)
267+
endif()
267268

268-
if(FORCE_POSIX)
269-
target_compile_definitions(api_client_test PRIVATE _POSIX_C_SOURCE=200809L)
270-
else()
271-
target_compile_definitions(api_client_test PRIVATE _GNU_SOURCE)
272-
endif()
269+
if(FORCE_POSIX)
270+
target_compile_definitions(api_client_test PRIVATE _POSIX_C_SOURCE=200809L)
271+
else()
272+
target_compile_definitions(api_client_test PRIVATE _GNU_SOURCE)
273+
endif()
273274

274-
add_test(NAME api_client_test COMMAND api_client_test)
275+
add_test(NAME api_client_test COMMAND api_client_test)
276+
endif()
275277

276278
add_executable(forward_test
277279
forward_test.c
@@ -416,6 +418,11 @@ if(LIBM)
416418
target_link_libraries(dialer_test PRIVATE m)
417419
endif()
418420

421+
if(WITH_RULESET)
422+
target_include_directories(dialer_test SYSTEM PRIVATE ${LUA_INCLUDE_DIR})
423+
target_link_libraries(dialer_test PRIVATE ${LUA_LIBRARY} ${CMAKE_DL_LIBS})
424+
endif()
425+
419426
if(WITH_CARES)
420427
target_include_directories(dialer_test SYSTEM PRIVATE ${LIBCARES_INCLUDE_DIR})
421428
target_link_libraries(dialer_test PRIVATE ${LIBCARES_LIBRARY})
@@ -460,6 +467,7 @@ if(WITH_LUA)
460467
ruleset/regex.c
461468
)
462469
target_include_directories(regex_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
470+
target_include_directories(regex_test SYSTEM PRIVATE ${LUA_INCLUDE_DIR})
463471
target_compile_options(regex_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
464472
target_compile_options(regex_test PRIVATE -pedantic -Wall -Wextra -Werror)
465473
target_link_libraries(regex_test PRIVATE csnippets miniz ${LUA_LIBRARY})
@@ -480,6 +488,7 @@ if(WITH_LUA)
480488
ruleset/time.c
481489
)
482490
target_include_directories(time_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
491+
target_include_directories(time_test SYSTEM PRIVATE ${LUA_INCLUDE_DIR})
483492
target_compile_options(time_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
484493
target_compile_options(time_test PRIVATE -pedantic -Wall -Wextra -Werror)
485494
target_link_libraries(time_test PRIVATE csnippets miniz ${LUA_LIBRARY})
@@ -504,6 +513,7 @@ if(WITH_LUA)
504513
"${CMAKE_CURRENT_BINARY_DIR}/version.c"
505514
)
506515
target_include_directories(base_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
516+
target_include_directories(base_test SYSTEM PRIVATE ${LUA_INCLUDE_DIR})
507517
target_compile_options(base_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
508518
target_compile_options(base_test PRIVATE -pedantic -Wall -Wextra -Werror)
509519
target_link_libraries(base_test PRIVATE csnippets miniz ${LIBEV_LIBRARY} ${LUA_LIBRARY})
@@ -533,6 +543,7 @@ if(WITH_LUA)
533543
"${CMAKE_CURRENT_BINARY_DIR}/version.c"
534544
)
535545
target_include_directories(marshal_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
546+
target_include_directories(marshal_test SYSTEM PRIVATE ${LUA_INCLUDE_DIR})
536547
target_compile_options(marshal_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
537548
target_compile_options(marshal_test PRIVATE -pedantic -Wall -Wextra -Werror)
538549
target_link_libraries(marshal_test PRIVATE csnippets miniz ${LIBEV_LIBRARY} ${LUA_LIBRARY})
@@ -563,6 +574,7 @@ if(WITH_LUA)
563574
"${CMAKE_CURRENT_BINARY_DIR}/version.c"
564575
)
565576
target_include_directories(zlib_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
577+
target_include_directories(zlib_test SYSTEM PRIVATE ${LUA_INCLUDE_DIR})
566578
target_compile_options(zlib_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
567579
target_compile_options(zlib_test PRIVATE -pedantic -Wall -Wextra -Werror)
568580
target_link_libraries(zlib_test PRIVATE csnippets miniz ${LIBEV_LIBRARY} ${LUA_LIBRARY})
@@ -586,6 +598,7 @@ if(WITH_LUA)
586598
ruleset_test.c
587599
)
588600
target_include_directories(ruleset_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
601+
target_include_directories(ruleset_test SYSTEM PRIVATE ${LUA_INCLUDE_DIR})
589602
target_compile_options(ruleset_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/config.h")
590603
target_compile_options(ruleset_test PRIVATE -pedantic -Wall -Wextra -Werror)
591604
target_link_libraries(ruleset_test PRIVATE csnippets miniz ${LIBEV_LIBRARY} ${LUA_LIBRARY})

‎src/ruleset/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ if(WITH_LUA)
2424
cfunc_test.c
2525
)
2626
target_include_directories(cfunc_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
27+
target_include_directories(cfunc_test SYSTEM PRIVATE ${LUA_INCLUDE_DIR})
2728
target_compile_options(cfunc_test PRIVATE "-include${CMAKE_CURRENT_BINARY_DIR}/../config.h")
2829
target_compile_options(cfunc_test PRIVATE -pedantic -Wall -Wextra -Werror)
2930
target_link_libraries(cfunc_test PRIVATE csnippets miniz ${LIBEV_LIBRARY} ${LUA_LIBRARY})

0 commit comments

Comments
 (0)