QPID-4745: Alternative port allocation for tests, instead of 'qpidd --port=0'

qpidd-p0 script binds a new port to a socket using bind(0), and then
execs qpidd using the --socket-fd option to pass the socket to qpidd.

It is intended to replace
  /path/to/qpidd --port 0 <args...>
with
  qpidd-p0 /path/to/qpidd <args...>

Most tests do not yet use qpidd-p0, they will be updated in a future commit.

Changes:
- Added qpidd-p0
- Fixed qpidd port printing logic: print port only if --port=0, regardless of --transport.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1494306 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 2 deletions

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); \