diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-06-17 19:45:48 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-06-17 19:45:48 +0000 |
| commit | 2407c96b7e388c7455e47112c3d7ef133ce62649 (patch) | |
| tree | e875dec9fa266dbb5182bb100d75c265cf6d24fa /qpid/cpp/src | |
| parent | d12057f1ac95e410c13a05abc757377132bdca35 (diff) | |
| download | qpid-python-2407c96b7e388c7455e47112c3d7ef133ce62649.tar.gz | |
QPID-4926: Get Unix sasl/ssl test working
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1493903 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/tests/CMakeLists.txt | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/qpid/cpp/src/tests/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt index 1738465740..6a7850e499 100644 --- a/qpid/cpp/src/tests/CMakeLists.txt +++ b/qpid/cpp/src/tests/CMakeLists.txt @@ -175,10 +175,15 @@ remember_location(unit_test) add_library (shlibtest MODULE shlibtest.cpp) -# FIXME aconway 2009-11-30: enable SSL -#if SSL -#include ssl.mk -#endif +if (BUILD_SASL) + add_custom_command( + OUTPUT sasl_config/qpidd.conf sasl_config/qpidd.sasldb + COMMAND sasl_test_setup.sh) + + add_custom_target( + sasl_config ALL + DEPENDS sasl_config/qpidd.conf sasl_config/qpidd.sasldb) +endif (BUILD_SASL) # # Other test programs @@ -285,6 +290,10 @@ add_executable (msg_group_test msg_group_test.cpp ${platform_test_additions}) target_link_libraries (msg_group_test qpidmessaging) remember_location(msg_group_test) +if (BUILD_SASL) + add_executable (sasl_version sasl_version.cpp ${platform_test_additions}) + remember_location(sasl_version) +endif (BUILD_SASL) # qpid-perftest and qpid-latency-test are generally useful so install them install (TARGETS @@ -314,15 +323,17 @@ endif (CMAKE_SYSTEM_NAME STREQUAL Windows) set(test_wrap ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/run_test${test_script_suffix}) add_test (unit_test ${test_wrap} ${unit_test_LOCATION}) -add_test (sasl_fed ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/sasl_fed${test_script_suffix}) -add_test (sasl_fed_ex_dynamic ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/sasl_fed_ex_dynamic${test_script_suffix}) -add_test (sasl_fed_ex_link ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/sasl_fed_ex_link${test_script_suffix}) -add_test (sasl_fed_ex_queue ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/sasl_fed_ex_queue${test_script_suffix}) -add_test (sasl_fed_ex_route ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/sasl_fed_ex_route${test_script_suffix}) -add_test (sasl_no_dir ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/sasl_no_dir${test_script_suffix}) -if (BUILD_SSL) - add_test(ssl_test ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/ssl_test${test_script_suffix}) -endif (BUILD_SSL) +if (BUILD_SASL) + add_test (sasl_fed ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/sasl_fed${test_script_suffix}) + add_test (sasl_fed_ex_dynamic ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/sasl_fed_ex_dynamic${test_script_suffix}) + add_test (sasl_fed_ex_link ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/sasl_fed_ex_link${test_script_suffix}) + add_test (sasl_fed_ex_queue ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/sasl_fed_ex_queue${test_script_suffix}) + add_test (sasl_fed_ex_route ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/sasl_fed_ex_route${test_script_suffix}) + add_test (sasl_no_dir ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/sasl_no_dir${test_script_suffix}) + if (BUILD_SSL) + add_test(ssl_test ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/ssl_test${test_script_suffix}) + endif (BUILD_SSL) +endif (BUILD_SASL) add_test (start_broker ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/start_broker${test_script_suffix}) add_test (qpid-client-test ${test_wrap} ${qpid-client-test_LOCATION}) add_test (quick_perftest ${test_wrap} ${qpid-perftest_LOCATION} --summary --count 100) |