Repository: qpid-proton Updated Branches: refs/heads/master 6134e216c -> ac06645c7
NO-JIRA: Made go_/cpp_ ctest target names consistent as go-/cpp- Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/ac06645c Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/ac06645c Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/ac06645c Branch: refs/heads/master Commit: ac06645c73cf4e89702ef68288f2909bd7d6066a Parents: 6134e21 Author: Alan Conway <[email protected]> Authored: Tue Sep 27 14:40:02 2016 -0400 Committer: Alan Conway <[email protected]> Committed: Tue Sep 27 14:40:02 2016 -0400 ---------------------------------------------------------------------- examples/cpp/CMakeLists.txt | 4 ++-- examples/go/CMakeLists.txt | 4 ++-- proton-c/bindings/cpp/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ac06645c/examples/cpp/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt index 017ef3f..4c094db 100644 --- a/examples/cpp/CMakeLists.txt +++ b/examples/cpp/CMakeLists.txt @@ -73,11 +73,11 @@ if(HAS_CPP11) add_executable(mt_${example} mt/${example}.cpp ${container_src}) target_link_libraries(mt_${example} pthread) endforeach() - add_cpp_test(cpp_mt_example_test ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example_test.py -v MtBrokerTest) + add_cpp_test(cpp-example-mt ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example_test.py -v MtBrokerTest) endif() endif() -add_cpp_test(cpp_container_example_test ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example_test.py -v ContainerExampleTest) +add_cpp_test(cpp-example-container ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example_test.py -v ContainerExampleTest) http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ac06645c/examples/go/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/examples/go/CMakeLists.txt b/examples/go/CMakeLists.txt index eb69006..868b780 100644 --- a/examples/go/CMakeLists.txt +++ b/examples/go/CMakeLists.txt @@ -43,11 +43,11 @@ if(BUILD_GO) WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) add_test( - NAME go_example_electron_test + NAME go-example-electron COMMAND ${GO_ENV} ${test_exe} -dir ${CMAKE_CURRENT_BINARY_DIR}/electron -broker broker) add_test( - NAME go_example_proton_test + NAME go-example-proton COMMAND ${GO_ENV} ${test_exe} -dir ${CMAKE_CURRENT_BINARY_DIR}/electron -broker ../proton/broker) list(APPEND ADDITIONAL_MAKE_CLEAN_FILES ${examples}) http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ac06645c/proton-c/bindings/cpp/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/CMakeLists.txt b/proton-c/bindings/cpp/CMakeLists.txt index 1561134..7709bae 100644 --- a/proton-c/bindings/cpp/CMakeLists.txt +++ b/proton-c/bindings/cpp/CMakeLists.txt @@ -164,12 +164,12 @@ macro(add_cpp_test test) add_executable (${test} src/${test}.cpp) target_link_libraries (${test} qpid-proton qpid-proton-cpp) if (CMAKE_SYSTEM_NAME STREQUAL Windows) - add_test (NAME cpp_${test} + add_test (NAME cpp-${test} COMMAND ${env_py} "PATH=$<TARGET_FILE_DIR:qpid-proton>" $<TARGET_FILE:${test}> ${ARGN}) else () - add_test (NAME cpp_${test} COMMAND ${memcheck-cmd} ${CMAKE_CURRENT_BINARY_DIR}/${test} ${ARGN}) + add_test (NAME cpp-${test} COMMAND ${memcheck-cmd} ${CMAKE_CURRENT_BINARY_DIR}/${test} ${ARGN}) endif () endmacro(add_cpp_test) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
