Modified the testHeartbeat method to use an external script to start & stop the broker.

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

3 files changed, 34 insertions, 1 deletions

diff --git a/java/test-profiles/default.testprofile b/java/test-profiles/default.testprofile
index dfc92f1e19..43b9c68d43 100644
--- a/java/test-profiles/default.testprofile
+++ b/java/test-profiles/default.testprofile
@@ -6,6 +6,8 @@ broker=vm
 broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB
 broker.ready=Listening on TCP port
 broker.config=${project.root}/build/etc/config-systests.xml
+broker.start=${test.profiles}/start-broker
+broker.kill=${test.profiles}/kill-broker
 
 max_prefetch=1000
 qpid.dest_syntax=BURL
diff --git a/java/test-profiles/kill-broker b/java/test-profiles/kill-broker
index e31d3811b3..8078fa755e 100755
--- a/java/test-profiles/kill-broker
+++ b/java/test-profiles/kill-broker
@@ -21,5 +21,6 @@
 # 
 #
 
-
+kill -CONT $1
 kill -9 $1
+rm /tmp/broker.log
diff --git a/java/test-profiles/start-broker b/java/test-profiles/start-broker
new file mode 100755
index 0000000000..1dc9cd4336
--- /dev/null
+++ b/java/test-profiles/start-broker
@@ -0,0 +1,30 @@
+
+#!/bin/bash
+#
+# 
+# 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.
+# 
+#
+
+# The entire broker command is passed as an argument.
+
+waitfor() { until grep -a -l "$2" $1 >/dev/null 2>&1 ; do sleep 1 ; done ; }
+
+sh $BROKER_CMD --log-to-file /tmp/broker.log &
+waitfor /tmp/broker.log $BROKER_READY
+