Repository: qpid-cpp Updated Branches: refs/heads/master f264cc6c0 -> 0ba019b73
NO-JIRA: only run sasl and acl tests if test sasldb was created Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/87fb2b01 Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/87fb2b01 Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/87fb2b01 Branch: refs/heads/master Commit: 87fb2b01fe8ed5251ff8f1a4f052d589f0748c23 Parents: f264cc6 Author: Gordon Sim <g...@redhat.com> Authored: Tue Oct 16 17:54:23 2018 +0100 Committer: Gordon Sim <g...@redhat.com> Committed: Tue Oct 16 18:56:36 2018 +0100 ---------------------------------------------------------------------- src/tests/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/87fb2b01/src/tests/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 0c843b2..693e8de 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -302,7 +302,6 @@ endif (BUILD_SASL) add_test(NAME unit_tests COMMAND ${PYTHON_EXECUTABLE} run_unit_tests) -add_test(NAME acl_tests COMMAND ${PYTHON_EXECUTABLE} run_acl_tests) add_test(NAME cli_tests COMMAND ${PYTHON_EXECUTABLE} run_cli_tests) add_test(NAME client_tests COMMAND ${PYTHON_EXECUTABLE} run_client_tests) add_test(NAME federation_tests COMMAND ${PYTHON_EXECUTABLE} run_federation_tests) @@ -338,13 +337,14 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows) add_test(NAME interlink_tests COMMAND ${PYTHON_EXECUTABLE} run_interlink_tests) endif (BUILD_AMQP) - if (BUILD_SASL) + if (BUILD_SASL AND SASLPASSWD2_EXECUTABLE) + add_test(NAME acl_tests COMMAND ${PYTHON_EXECUTABLE} run_acl_tests) add_test(NAME sasl_tests COMMAND run_sasl_tests) if (BUILD_SSL) add_test(NAME ssl_tests COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/run_ssl_tests) endif (BUILD_SSL) - endif (BUILD_SASL) + endif (BUILD_SASL AND SASLPASSWD2_EXECUTABLE) endif (CMAKE_SYSTEM_NAME STREQUAL Windows) endif (BUILD_TESTING) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
