Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit8e6237c

Browse files
committed
Added test for python when running HTTP server unit tests.
1 parent25745d5 commit8e6237c

File tree

1 file changed

+19
-13
lines changed

1 file changed

+19
-13
lines changed

‎libs/network/test/http/CMakeLists.txt‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
include_directories(${CPP-NETLIB_SOURCE_DIR})
88
find_package( Boost 1.45.0 REQUIRED unit_test_frameworksystemregex thread filesystem )
99
find_package( OpenSSL )
10+
find_package( PythonInterp )
1011

1112
if (OPENSSL_FOUND)
1213
include_directories(${OPENSSL_INCLUDE_DIR} )
@@ -60,31 +61,36 @@ if (Boost_FOUND)
6061
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test})
6162
endforeach (test)
6263

63-
set ( SERVER_TESTS
64+
if ( PYTHONINTERP_FOUND )
65+
set ( SERVER_TESTS
6466
server_hello_world
6567
server_async
6668
server_async_less_copy
6769
)
68-
set ( PORT 8000 )
69-
foreach (test${SERVER_TESTS} )
70+
set ( PORT 8000 )
71+
foreach (test${SERVER_TESTS} )
7072
if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)
71-
set_source_files_properties(${test}.cpp
72-
PROPERTIESCOMPILE_FLAGS"-Wall")
73+
set_source_files_properties(${test}.cpp
74+
PROPERTIESCOMPILE_FLAGS"-Wall")
7375
endif()
7476
add_executable(cpp-netlib-http-${test}${test}.cpp)
7577
add_dependencies(cpp-netlib-http-${test} cppnetlib-server-parsers)
7678
target_link_libraries(cpp-netlib-http-${test}${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)
7779
set_target_properties(cpp-netlib-http-${test}
78-
PROPERTIESRUNTIME_OUTPUT_DIRECTORY
79-
${CPP-NETLIB_BINARY_DIR}/tests)
80+
PROPERTIESRUNTIME_OUTPUT_DIRECTORY
81+
${CPP-NETLIB_BINARY_DIR}/tests)
8082
add_test(cpp-netlib-${test}
81-
python
82-
${CPP-NETLIB_SOURCE_DIR}/libs/network/test/httplib_acceptance.py
83-
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test}
84-
${PORT}
85-
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test}.passed)
83+
${PYTHON_EXECUTABLE}
84+
${CPP-NETLIB_SOURCE_DIR}/libs/network/test/httplib_acceptance.py
85+
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test}
86+
${PORT}
87+
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test}.passed)
8688
math (EXPR PORT"${PORT} + 1")
87-
endforeach (test)
89+
endforeach (test)
90+
#else()
91+
# message(STATUS "Python not found, won't run server tests."
92+
endif( PYTHONINTERP_FOUND )
93+
8894

8995
#set ( INLINED_TESTS
9096
# client_include_inlined

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp