diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-05-07 15:38:43 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-05-07 15:38:43 +0000 |
| commit | 085f9bcab0fc0bc14fd679c9c288fbc9063b3dfe (patch) | |
| tree | d05bfab014967b69159e6498983adf09b56dae77 /cpp/src/tests/CMakeLists.txt | |
| parent | 27982387a4dfd4e7c4b9894731cb66f9d21f5310 (diff) | |
| download | qpid-python-085f9bcab0fc0bc14fd679c9c288fbc9063b3dfe.tar.gz | |
More work on cmake: Get many more tests working on Linux now
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@772681 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/CMakeLists.txt')
| -rw-r--r-- | cpp/src/tests/CMakeLists.txt | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/cpp/src/tests/CMakeLists.txt b/cpp/src/tests/CMakeLists.txt index 79f6b9e582..4edbd0f2e5 100644 --- a/cpp/src/tests/CMakeLists.txt +++ b/cpp/src/tests/CMakeLists.txt @@ -220,21 +220,23 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows) set (test_script_suffix ".w32") endif (CMAKE_SYSTEM_NAME STREQUAL Windows) +set(test_wrap ${CMAKE_CURRENT_SOURCE_DIR}/test_wrap${test_script_suffix}) + add_test (unit_test unit_test) add_test (start_broker ${CMAKE_CURRENT_SOURCE_DIR}/start_broker${test_script_suffix}) -add_test (client_test client_test) -add_test (quick_perftest perftest --summary --count 100) -add_test (quick_topictest ${CMAKE_CURRENT_SOURCE_DIR}/quick_topictest${test_script_suffix}) -add_test (quick_txtest txtest --queues 4 --tx-count 10 --quiet) -if (${PYTHONINTERP_FOUND}) - add_test (run_header_test run_header_test${test_script_suffix}) - add_test (python_tests python_tests${test_script_suffix}) -endif (${PYTHONINTERP_FOUND}) +add_test (client_test ${test_wrap} ./client_test) +add_test (quick_perftest ${test_wrap} ./perftest --summary --count 100) +add_test (quick_topictest ${test_wrap} ${CMAKE_CURRENT_SOURCE_DIR}/quick_topictest${test_script_suffix}) +add_test (quick_txtest ${test_wrap} ./txtest --queues 4 --tx-count 10 --quiet) +if (PYTHON_EXECUTABLE) + add_test (run_header_test ${test_wrap} ${CMAKE_CURRENT_SOURCE_DIR}/run_header_test${test_script_suffix}) + add_test (python_tests ${test_wrap} ${CMAKE_CURRENT_SOURCE_DIR}/python_tests${test_script_suffix}) +endif (PYTHON_EXECUTABLE) add_test (stop_broker ${CMAKE_CURRENT_SOURCE_DIR}/stop_broker${test_script_suffix}) -if (${PYTHONINTERP_FOUND}) - add_test (federation_tests run_federation_tests${test_script_suffix}) - add_test (acl_tests run_acl_tests${test_script_suffix}) -endif (${PYTHONINTERP_FOUND}) +if (PYTHON_EXECUTABLE) + add_test (federation_tests ${CMAKE_CURRENT_SOURCE_DIR}/run_federation_tests${test_script_suffix}) + add_test (acl_tests ${CMAKE_CURRENT_SOURCE_DIR}/run_acl_tests${test_script_suffix}) +endif (PYTHON_EXECUTABLE) #EXTRA_DIST += \ # run_test vg_check \ |