diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | perf/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tools/nngcat/CMakeLists.txt | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fdafc62..46df35d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -380,8 +380,8 @@ macro(nng_test NAME) ${PROJECT_SOURCE_DIR}/tests ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/include) - add_test(NAME ${NAME} COMMAND ${NAME} -t) - set_tests_properties(${NAME} PROPERTIES TIMEOUT 180) + add_test(NAME ${PROJECT_NAME}.${NAME} COMMAND ${NAME} -t) + set_tests_properties(${PROJECT_NAME}.${NAME} PROPERTIES TIMEOUT 180) endif () endmacro() diff --git a/perf/CMakeLists.txt b/perf/CMakeLists.txt index ff340034..5d780f2f 100644 --- a/perf/CMakeLists.txt +++ b/perf/CMakeLists.txt @@ -43,11 +43,11 @@ if (NNG_TESTS) add_nng_perf(inproc_thr) add_nng_perf(inproc_lat) - add_test (NAME inproc_lat COMMAND inproc_lat 64 10000) - set_tests_properties (inproc_lat PROPERTIES TIMEOUT 30) + add_test (NAME ${PROJECT_NAME}.inproc_lat COMMAND inproc_lat 64 10000) + set_tests_properties (${PROJECT_NAME}.inproc_lat PROPERTIES TIMEOUT 30) - add_test (NAME inproc_thr COMMAND inproc_thr 1400 10000) - set_tests_properties (inproc_thr PROPERTIES TIMEOUT 30) + add_test (NAME ${PROJECT_NAME}.inproc_thr COMMAND inproc_thr 1400 10000) + set_tests_properties (${PROJECT_NAME}.inproc_thr PROPERTIES TIMEOUT 30) add_executable (pubdrop pubdrop.c) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5a489c91..90d674ff 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -54,9 +54,9 @@ if (NNG_TESTS) macro(add_nng_test NAME TIMEOUT) add_executable(${NAME} ${NAME}.c convey.c) target_link_libraries(${NAME} ${PROJECT_NAME}_testlib ${THRLIB}) - add_test(NAME ${NAME} COMMAND ${NAME} -v -p TEST_PORT=${NNG_TEST_PORT}) + add_test(NAME ${PROJECT_NAME}.${NAME} COMMAND ${NAME} -v -p TEST_PORT=${NNG_TEST_PORT}) math(EXPR TIMEOUT ${TIMEOUT}*${TIMEOUT_FACTOR}) - set_tests_properties(${NAME} PROPERTIES TIMEOUT ${TIMEOUT}) + set_tests_properties(${PROJECT_NAME}.${NAME} PROPERTIES TIMEOUT ${TIMEOUT}) math(EXPR NNG_TEST_PORT "${NNG_TEST_PORT}+20") endmacro(add_nng_test) @@ -69,8 +69,8 @@ if (NNG_TESTS) target_include_directories(${NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src/compat ${PROJECT_SOURCE_DIR}/include) - add_test(NAME ${NAME} COMMAND ${NAME} ${NNG_TEST_PORT}) - set_tests_properties(${NAME} PROPERTIES TIMEOUT ${TIMEOUT}) + add_test(NAME ${PROJECT_NAME}.${NAME} COMMAND ${NAME} ${NNG_TEST_PORT}) + set_tests_properties(${PROJECT_NAME}.${NAME} PROPERTIES TIMEOUT ${TIMEOUT}) math(EXPR NNG_TEST_PORT "${NNG_TEST_PORT}+20") endmacro(add_nng_compat_test) @@ -79,8 +79,8 @@ if (NNG_TESTS) enable_language(CXX) add_executable(${NAME} ${NAME}.cc) target_link_libraries(${NAME} ${PROJECT_NAME}_testlib) - add_test(NAME ${NAME} COMMAND ${NAME} ${TEST_PORT}) - set_tests_properties(${NAME} PROPERTIES TIMEOUT ${TIMEOUT}) + add_test(NAME ${PROJECT_NAME}.${NAME} COMMAND ${NAME} ${TEST_PORT}) + set_tests_properties(${PROJECT_NAME}.${NAME} PROPERTIES TIMEOUT ${TIMEOUT}) math(EXPR TEST_PORT "${NNG_TEST_PORT}+20") endif () endmacro(add_nng_cpp_test) diff --git a/tools/nngcat/CMakeLists.txt b/tools/nngcat/CMakeLists.txt index bcfc575b..cfdc0944 100644 --- a/tools/nngcat/CMakeLists.txt +++ b/tools/nngcat/CMakeLists.txt @@ -17,8 +17,8 @@ if (NNG_ENABLE_NNGCAT) if (NNG_TESTS AND NNG_PLATFORM_POSIX AND BASH) macro(add_nngcat_test NAME TIMEOUT) - add_test (NAME ${NAME} COMMAND ${BASH} ${CMAKE_CURRENT_SOURCE_DIR}/${NAME}_test.sh $<TARGET_FILE:nngcat>) - set_tests_properties (${NAME} PROPERTIES TIMEOUT ${TIMEOUT}) + add_test (NAME ${PROJECT_NAME}.${NAME} COMMAND ${BASH} ${CMAKE_CURRENT_SOURCE_DIR}/${NAME}_test.sh $<TARGET_FILE:nngcat>) + set_tests_properties (${PROJECT_NAME}.${NAME} PROPERTIES TIMEOUT ${TIMEOUT}) endmacro() add_nngcat_test (nngcat_async 10) add_nngcat_test (nngcat_ambiguous 2) |