You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2013/06/17 21:45:48 UTC
svn commit: r1493903 - /qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Author: astitcher
Date: Mon Jun 17 19:45:48 2013
New Revision: 1493903
URL: http://svn.apache.org/r1493903
Log:
QPID-4926: Get Unix sasl/ssl test working
Modified:
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1493903&r1=1493902&r2=1493903&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Mon Jun 17 19:45:48 2013
@@ -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
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 Window
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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org