diff options
| author | Gordon Sim <gsim@apache.org> | 2013-10-25 14:26:02 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2013-10-25 14:26:02 +0000 |
| commit | b5bd56e6eceeff2ad4eb29f0ffc544abd3846926 (patch) | |
| tree | 4a52297480fa98981535bb8977f470951d21d703 /qpid/cpp/src/tests | |
| parent | 0fc6f70f8e8c5cc1dd8bff6b519aca58373ea3ba (diff) | |
| download | qpid-python-b5bd56e6eceeff2ad4eb29f0ffc544abd3846926.tar.gz | |
QPID-4927: paged queue tests take too long under valgrind, so run them separately
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1535750 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/CMakeLists.txt | 8 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/run_paged_queue_tests | 15 |
2 files changed, 15 insertions, 8 deletions
diff --git a/qpid/cpp/src/tests/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt index 114a20e96b..72ab6ae0d6 100644 --- a/qpid/cpp/src/tests/CMakeLists.txt +++ b/qpid/cpp/src/tests/CMakeLists.txt @@ -321,16 +321,16 @@ add_test (qpid-client-test ${test_wrap} ${qpid-client-test_LOCATION}) add_test (quick_perftest ${test_wrap} ${qpid-perftest_LOCATION} --summary --count 100) add_test (quick_topictest ${test_wrap} ${CMAKE_CURRENT_SOURCE_DIR}/quick_topictest${test_script_suffix}) add_test (quick_txtest ${test_wrap} ${qpid-txtest_LOCATION} --queues 4 --tx-count 10 --quiet) -if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) - # paged queue not yet implemented for windows - add_test (paged_queue_tests ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/run_paged_queue_tests${test_script_suffix}) -endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) add_test (msg_group_tests ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/run_msg_group_tests${test_script_suffix}) if (PYTHON_EXECUTABLE) add_test (run_header_test ${shell} ${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 ${test_wrap} ${CMAKE_CURRENT_SOURCE_DIR}/stop_broker${test_script_suffix}) +if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) + # paged queue not yet implemented for windows + add_test (paged_queue_tests ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/run_paged_queue_tests${test_script_suffix}) +endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) if (PYTHON_EXECUTABLE) add_test (ha_tests ${test_wrap} ${CMAKE_CURRENT_SOURCE_DIR}/ha_tests.py) add_test (qpidd_qmfv2_tests ${test_wrap} ${CMAKE_CURRENT_SOURCE_DIR}/qpidd_qmfv2_tests.py) diff --git a/qpid/cpp/src/tests/run_paged_queue_tests b/qpid/cpp/src/tests/run_paged_queue_tests index 8a72c23d86..83e6ba863c 100755 --- a/qpid/cpp/src/tests/run_paged_queue_tests +++ b/qpid/cpp/src/tests/run_paged_queue_tests @@ -21,12 +21,19 @@ #setup path to find qpid-config and sender/receiver test progs source ./test_env.sh +trap stop_broker INT TERM QUIT export PATH=$PWD:$srcdir:$PYTHON_COMMANDS:$PATH -#set port to connect to via env var -test -s qpidd.port && QPID_PORT=`cat qpidd.port` -export QPID_PORT +start_broker() { + QPID_PORT=$($QPIDD_EXEC --daemon --port 0 --interface 127.0.0.1 --no-data-dir $MODULES --auth no) || fail "Could not start broker" +} +stop_broker() { + $QPIDD_EXEC -q --port $QPID_PORT +} + +start_broker qpid-cpp-benchmark --broker "localhost:$QPID_PORT" --create-option "node:{x-declare:{arguments:{'qpid.paging':True,'qpid.max_size':0,'qpid.max_count':0,'qpid.flow_stop_size':0,'qpid.flow_resume_size':0,'qpid.flow_stop_count':0,'qpid.flow_resume_count':0}}}" -qpid-cpp-benchmark --broker "localhost:$QPID_PORT" --create-option "node:{x-declare:{arguments:{'qpid.paging':True,'qpid.max_size':0,'qpid.max_count':0,'qpid.flow_stop_size':0,'qpid.flow_resume_size':0,'qpid.flow_stop_count':0,'qpid.flow_resume_count':0}}}" --fill-drain
\ No newline at end of file +qpid-cpp-benchmark --broker "localhost:$QPID_PORT" --create-option "node:{x-declare:{arguments:{'qpid.paging':True,'qpid.max_size':0,'qpid.max_count':0,'qpid.flow_stop_size':0,'qpid.flow_resume_size':0,'qpid.flow_stop_count':0,'qpid.flow_resume_count':0}}}" --fill-drain +stop_broker |