diff options
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/Makefile.am | 10 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/qpidd-p0 | 46 |
3 files changed, 56 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt index 337403df25..4763bc0b80 100644 --- a/qpid/cpp/src/tests/CMakeLists.txt +++ b/qpid/cpp/src/tests/CMakeLists.txt @@ -47,6 +47,8 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows) ${CMAKE_CURRENT_BINARY_DIR}/test_env.sh) endif (CMAKE_SYSTEM_NAME STREQUAL Windows) +# Copy qpidd-p0 script to build directory so tests can find it. +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/qpidd-p0 ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) # If valgrind is selected in the configuration step, set up the path to it # for CTest. diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am index 92532895c5..7aa8add442 100644 --- a/qpid/cpp/src/tests/Makefile.am +++ b/qpid/cpp/src/tests/Makefile.am @@ -380,13 +380,19 @@ check-long: $(MAKE) check TESTS="$(LONG_TESTS)" VALGRIND= # Things that should be built before the check target runs. -check-am: python_prep test_env.sh install_env.sh sasl_config +check-am: python_prep test_env.sh install_env.sh sasl_config qpidd-p0 PYTHON_SRC_DIR=$(abs_srcdir)/../../../python PYTHON_BLD_DIR=$(abs_builddir)/python +# Copy qpidd-p0 to build directory so tests can find it easily. +qpidd-p0: force + cp $(abs_srcdir)/qpidd-p0 . + +force: + # Generate python client as part of the all-am target so it gets built before tests. -all-am: python_prep +all-am: python_prep qpidd-p0 python_prep: if test -d $(PYTHON_SRC_DIR); \ diff --git a/qpid/cpp/src/tests/qpidd-p0 b/qpid/cpp/src/tests/qpidd-p0 new file mode 100755 index 0000000000..9bc605c0aa --- /dev/null +++ b/qpid/cpp/src/tests/qpidd-p0 @@ -0,0 +1,46 @@ +#!/usr/bin/env python + +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +# Wrapper script to allocate a port and fork a broker to listen on it. +# +# Instead of this: +# qpidd --port 0 <qpidd-args...> +# do this: +# qpidd-p0 <qpidd-args...> +# +# The port is bound by python code, and then handed over to the broker via the +# --socket-fd option. This avoids problems with the qpidd --port 0 option which +# ocassional fails with an "address in use" error. It's not clear why --port 0 +# doesn't work, it may be to do with the way qpidd binds a port to multiple +# addresses on a multi-homed host. +# + +import subprocess, socket, time, os, sys + +s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +s.bind(("", 0)) +s.listen(5) +port = s.getsockname()[1] +print port +sys.stdout.flush() +if len(sys.argv) > 1: + cmd = sys.argv[1:] + ["--socket-fd", str(s.fileno()), "--listen-disable=tcp", "--port", str(port)] + os.execvp(sys.argv[1], cmd) |