Skip to content

Commit d080299

Browse files
author
Peter Thorson
committed
Merge branch 'pr/502' into develop
2 parents 9713455 + 20cc197 commit d080299

File tree

14 files changed

+55
-29
lines changed

14 files changed

+55
-29
lines changed

Diff for: ‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,5 @@ examples/wsperf/wsperf_client
9090
install
9191
Makefile
9292
bin
93+
94+
Testing/Temporary/CTestCostData.txt

Diff for: ‎CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ option (BUILD_TESTS "Build websocketpp tests." FALSE)
6969

7070
if (BUILD_TESTS OR BUILD_EXAMPLES)
7171

72+
enable_testing ()
73+
7274
############ Compiler specific setup
7375

7476
set (WEBSOCKETPP_PLATFORM_LIBS "")
@@ -190,6 +192,10 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
190192
set (Boost_USE_STATIC_LIBS TRUE)
191193
endif ()
192194

195+
if (NOT Boost_USE_STATIC_LIBS)
196+
add_definitions (/DBOOST_TEST_DYN_LINK)
197+
endif ()
198+
193199
set (Boost_FIND_REQUIRED TRUE)
194200
set (Boost_FIND_QUIETLY TRUE)
195201
set (Boost_DEBUG FALSE)

Diff for: ‎cmake/CMakeHelpers.cmake

+18
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ macro (print_used_build_config)
1515
message (STATUS "WEBSOCKETPP_PLATFORM_LIBS = ${WEBSOCKETPP_PLATFORM_LIBS}")
1616
message (STATUS "WEBSOCKETPP_PLATFORM_TLS_LIBS = ${WEBSOCKETPP_PLATFORM_TLS_LIBS}")
1717
message ("")
18+
message (STATUS "OPENSSL_FOUND = ${OPENSSL_FOUND}")
19+
message (STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}")
20+
message (STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}")
21+
message (STATUS "OPENSSL_VERSION = ${OPENSSL_VERSION}")
22+
message ("")
1823
endmacro ()
1924

2025
# Adds the given folder_name into the source files of the current project.
@@ -49,10 +54,23 @@ macro (build_executable TARGET_NAME)
4954

5055
include_directories (${WEBSOCKETPP_ROOT} ${WEBSOCKETPP_INCLUDE})
5156

57+
target_link_libraries(${TARGET_NAME} ${WEBSOCKETPP_PLATFORM_LIBS})
58+
5259
set_target_properties (${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${WEBSOCKETPP_BIN})
5360
set_target_properties (${TARGET_NAME} PROPERTIES DEBUG_POSTFIX d)
5461
endmacro ()
5562

63+
# Build executable and register as test
64+
macro (build_test TARGET_NAME)
65+
build_executable (${TARGET_NAME} ${ARGN})
66+
67+
if (${CMAKE_VERSION} VERSION_LESS 3)
68+
message(WARNING "CMake too old to register ${TARGET_NAME} as a test")
69+
else ()
70+
add_test(NAME ${TARGET_NAME} COMMAND $<TARGET_FILE:${TARGET_NAME}>)
71+
endif ()
72+
endmacro ()
73+
5674
# Finalize target for all types
5775
macro (final_target)
5876
if ("${TARGET_LIB_TYPE}" STREQUAL "EXECUTABLE")

Diff for: ‎test/connection/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ file (GLOB HEADER_FILES *.hpp)
44

55
init_target (test_connection)
66

7-
build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
7+
build_test (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
88

99
link_boost ()
1010
final_target ()

Diff for: ‎test/endpoint/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if (OPENSSL_FOUND)
66

77
init_target (test_endpoint)
88

9-
build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
9+
build_test (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
1010

1111
link_boost ()
1212
link_openssl ()

Diff for: ‎test/extension/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if ( ZLIB_FOUND )
1313
file (GLOB SOURCE permessage_deflate.cpp)
1414

1515
init_target (test_permessage_deflate)
16-
build_executable (${TARGET_NAME} ${SOURCE})
16+
build_test (${TARGET_NAME} ${SOURCE})
1717
link_boost ()
1818
link_zlib()
1919
final_target ()

Diff for: ‎test/http/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ file (GLOB SOURCE_FILES parser.cpp)
33

44
init_target (test_http)
55

6-
build_executable (${TARGET_NAME} ${SOURCE_FILES})
6+
build_test (${TARGET_NAME} ${SOURCE_FILES})
77

88
link_boost ()
99
final_target ()

Diff for: ‎test/logger/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ file (GLOB HEADER_FILES *.hpp)
44

55
init_target (test_logger)
66

7-
build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
7+
build_test (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
88

99
link_boost ()
1010
final_target ()

Diff for: ‎test/message_buffer/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
1111
file (GLOB SOURCE message.cpp)
1212

1313
init_target (test_message_buffer)
14-
build_executable (${TARGET_NAME} ${SOURCE})
14+
build_test (${TARGET_NAME} ${SOURCE})
1515
link_boost ()
1616
final_target ()
1717
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")

Diff for: ‎test/processors/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
file (GLOB SOURCE processor.cpp)
33

44
init_target (test_processor)
5-
build_executable (${TARGET_NAME} ${SOURCE})
5+
build_test (${TARGET_NAME} ${SOURCE})
66
link_boost ()
77
final_target ()
88
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -11,7 +11,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
1111
file (GLOB SOURCE hybi00.cpp)
1212

1313
init_target (test_processor_hybi00)
14-
build_executable (${TARGET_NAME} ${SOURCE})
14+
build_test (${TARGET_NAME} ${SOURCE})
1515
link_boost ()
1616
final_target ()
1717
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -20,7 +20,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
2020
file (GLOB SOURCE hybi07.cpp)
2121

2222
init_target (test_processor_hybi07)
23-
build_executable (${TARGET_NAME} ${SOURCE})
23+
build_test (${TARGET_NAME} ${SOURCE})
2424
link_boost ()
2525
final_target ()
2626
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -29,7 +29,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
2929
file (GLOB SOURCE hybi08.cpp)
3030

3131
init_target (test_processor_hybi08)
32-
build_executable (${TARGET_NAME} ${SOURCE})
32+
build_test (${TARGET_NAME} ${SOURCE})
3333
link_boost ()
3434
final_target ()
3535
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -40,7 +40,7 @@ if (ZLIB_FOUND)
4040
file (GLOB SOURCE hybi13.cpp)
4141

4242
init_target (test_processor_hybi13)
43-
build_executable (${TARGET_NAME} ${SOURCE})
43+
build_test (${TARGET_NAME} ${SOURCE})
4444
link_boost ()
4545
link_zlib()
4646
final_target ()
@@ -50,7 +50,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
5050
file (GLOB SOURCE extension_permessage_compress.cpp)
5151

5252
init_target (test_processor_extension_permessage_compress)
53-
build_executable (${TARGET_NAME} ${SOURCE})
53+
build_test (${TARGET_NAME} ${SOURCE})
5454
link_boost ()
5555
link_zlib()
5656
final_target ()

Diff for: ‎test/random/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
file (GLOB SOURCE none.cpp)
33

44
init_target (test_random_none)
5-
build_executable (${TARGET_NAME} ${SOURCE})
5+
build_test (${TARGET_NAME} ${SOURCE})
66
link_boost ()
77
final_target ()
88
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -11,7 +11,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
1111
file (GLOB SOURCE random_device.cpp)
1212

1313
init_target (test_random_random_device)
14-
build_executable (${TARGET_NAME} ${SOURCE})
14+
build_test (${TARGET_NAME} ${SOURCE})
1515
link_boost ()
1616
final_target ()
1717
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")

Diff for: ‎test/roles/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
file (GLOB SOURCE client.cpp)
33

44
init_target (test_roles_client)
5-
build_executable (${TARGET_NAME} ${SOURCE})
5+
build_test (${TARGET_NAME} ${SOURCE})
66
link_boost ()
77
final_target ()
88
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -11,7 +11,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
1111
file (GLOB SOURCE server.cpp)
1212

1313
init_target (test_roles_server)
14-
build_executable (${TARGET_NAME} ${SOURCE})
14+
build_test (${TARGET_NAME} ${SOURCE})
1515
link_boost ()
1616
final_target ()
1717
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")

Diff for: ‎test/transport/CMakeLists.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if (OPENSSL_FOUND)
44
file (GLOB SOURCE integration.cpp)
55

66
init_target (test_transport)
7-
build_executable (${TARGET_NAME} ${SOURCE})
7+
build_test (${TARGET_NAME} ${SOURCE})
88
link_boost ()
99
link_openssl()
1010
final_target ()
@@ -14,7 +14,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
1414
file (GLOB SOURCE asio/timers.cpp)
1515

1616
init_target (test_transport_asio_timers)
17-
build_executable (${TARGET_NAME} ${SOURCE})
17+
build_test (${TARGET_NAME} ${SOURCE})
1818
link_boost ()
1919
link_openssl()
2020
final_target ()
@@ -24,7 +24,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
2424
file (GLOB SOURCE asio/security.cpp)
2525

2626
init_target (test_transport_asio_security)
27-
build_executable (${TARGET_NAME} ${SOURCE})
27+
build_test (${TARGET_NAME} ${SOURCE})
2828
link_boost ()
2929
link_openssl()
3030
final_target ()
@@ -36,7 +36,7 @@ endif()
3636
file (GLOB SOURCE iostream/base.cpp)
3737

3838
init_target (test_transport_iostream_base)
39-
build_executable (${TARGET_NAME} ${SOURCE})
39+
build_test (${TARGET_NAME} ${SOURCE})
4040
link_boost ()
4141
final_target ()
4242
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -45,7 +45,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
4545
file (GLOB SOURCE iostream/endpoint.cpp)
4646

4747
init_target (test_transport_iostream_endpoint)
48-
build_executable (${TARGET_NAME} ${SOURCE})
48+
build_test (${TARGET_NAME} ${SOURCE})
4949
link_boost ()
5050
final_target ()
5151
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -54,7 +54,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
5454
file (GLOB SOURCE iostream/connection.cpp)
5555

5656
init_target (test_transport_iostream_connection)
57-
build_executable (${TARGET_NAME} ${SOURCE})
57+
build_test (${TARGET_NAME} ${SOURCE})
5858
link_boost ()
5959
final_target ()
6060
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -63,7 +63,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
6363
file (GLOB SOURCE asio/base.cpp)
6464

6565
init_target (test_transport_asio_base)
66-
build_executable (${TARGET_NAME} ${SOURCE})
66+
build_test (${TARGET_NAME} ${SOURCE})
6767
link_boost ()
6868
final_target ()
6969
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")

Diff for: ‎test/utility/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
file (GLOB SOURCE close.cpp)
33

44
init_target (test_close)
5-
build_executable (${TARGET_NAME} ${SOURCE})
5+
build_test (${TARGET_NAME} ${SOURCE})
66
link_boost ()
77
final_target ()
88
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -11,7 +11,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
1111
file (GLOB SOURCE error.cpp)
1212

1313
init_target (test_error)
14-
build_executable (${TARGET_NAME} ${SOURCE})
14+
build_test (${TARGET_NAME} ${SOURCE})
1515
link_boost ()
1616
final_target ()
1717
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -20,7 +20,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
2020
file (GLOB SOURCE frame.cpp)
2121

2222
init_target (test_frame)
23-
build_executable (${TARGET_NAME} ${SOURCE})
23+
build_test (${TARGET_NAME} ${SOURCE})
2424
link_boost ()
2525
final_target ()
2626
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -29,7 +29,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
2929
file (GLOB SOURCE sha1.cpp)
3030

3131
init_target (test_sha1)
32-
build_executable (${TARGET_NAME} ${SOURCE})
32+
build_test (${TARGET_NAME} ${SOURCE})
3333
link_boost ()
3434
final_target ()
3535
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -38,7 +38,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
3838
file (GLOB SOURCE uri.cpp)
3939

4040
init_target (test_uri)
41-
build_executable (${TARGET_NAME} ${SOURCE})
41+
build_test (${TARGET_NAME} ${SOURCE})
4242
link_boost ()
4343
final_target ()
4444
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -47,7 +47,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
4747
file (GLOB SOURCE utilities.cpp)
4848

4949
init_target (test_utilities)
50-
build_executable (${TARGET_NAME} ${SOURCE})
50+
build_test (${TARGET_NAME} ${SOURCE})
5151
link_boost ()
5252
final_target ()
5353
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")

0 commit comments

Comments
 (0)