From 8ea91b2aa2b1a6a3fdbf47a2eb36e7c2c997bec8 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Wed, 27 Jun 2007 00:12:26 +0000
Subject: 	Make check now starts a broker on a dynamically assigned port,
 so 	multiple qpid builds on one host will not conflict.

	* src/tests/run_test, start_broker, kill_broker:
	  Broker writes port to file, run_test sets QPID_PORT
	  in environment of all tests.

	* src/tests/topic_publisher.cpp, topic_listener.cpp, client_test.cpp:
	  All test clients use TestOptions to parse options from args and env.

	* src/qpid/Options.h: Renamed from CommonOptions.h
	  Simplified use of Options class.

	* src/qpid/Url.h: Renamed defaultPort constant.

	* src/tests/logging.cpp:
	* src/tests/interop_runner.cpp:
	* src/tests/TestOptions.h:
	* src/qpidd.cpp:
	* src/qpid/log/Options.cpp:
	* src/qpid/log/Logger.cpp:
	* src/qpid/broker/Broker.cpp:
	  Updated for changes to Options.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@550993 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/tests/daemon_test | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100755 qpid/cpp/src/tests/daemon_test

(limited to 'qpid/cpp/src/tests/daemon_test')

diff --git a/qpid/cpp/src/tests/daemon_test b/qpid/cpp/src/tests/daemon_test
deleted file mode 100755
index 6d1fc73923..0000000000
--- a/qpid/cpp/src/tests/daemon_test
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Without arguments run all daemon tests, exit status is number of failures.
-# With arguments run just the test named by $1.
-#
-
-TEMP=`mktemp`
-qpidd="../qpidd --log.output qpidd.log"
-client_tests=./client_test
-trap 'rm -f $TEMP' 0
-
-fail() { echo FAIL: $0:$* 1>&2; exit 1; }
-
-# Start and stop daemon on default port.
-PID=`$qpidd --check` && fail $LINENO: qpidd already running pid=$PID
-$qpidd -d || fail $LINENO: $qpidd -d failed
-$qpidd -c >/dev/null || fail $LINENO: qpidd --check says qpidd did not start
-./client_test > $TEMP || fail $LINENO:  client_test: `cat $TEMP`
-$qpidd -q || fail $LINENO: qpidd -q failed
-$qpidd -c >/dev/null && fail $LINENO: Still running after quit.
-
-# Start and stop daemon on dynamic port.
-export QPID_PORT=`$qpidd -dp0`
-# Note: QPID_PORT fom environment will be used below here:
-$qpidd -c >/dev/null || fail $LINENO: qpidd did not start. QPID_PORT=$QPID_PORT
-$qpidd -q || fail $LINENO: qpidd -q failed. QPID_PORT=$QPID_PORT
-$qpidd -c >/dev/null && fail $LINENO: Still running after start. QPID_PORT=$QPID_PORT
-
-# FIXME aconway 2007-06-11: run client test, needs a --port option.
-
-
-true
-- 
cgit v1.2.1