Added log4j config to the test launcher

Added shell script to run testkit.py
Removed brokertest.py, instead using the version checked in under python/qpid folder by Alan.
The shell scripts and the setup is work in progress, checking in now to help Alan reproduce an issue.


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

2 files changed, 76 insertions, 0 deletions

diff --git a/qpid/java/testkit/bin/qpid-python-testkit b/qpid/java/testkit/bin/qpid-python-testkit
new file mode 100755
index 0000000000..3584e14d88
--- /dev/null
+++ b/qpid/java/testkit/bin/qpid-python-testkit
@@ -0,0 +1,32 @@
+#!/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.
+#
+
+# This is wrapper script to run the tests defined in testkit.py 
+# via the python test runner. The defaults are set for a running
+# from an svn checkout
+
+. ./setenv.sh
+
+export PYTHONPATH=../:$PYTHONPATH
+
+echo $PYTHONPATH
+
+$PYTHON_DIR/qpid-python-test -m testkit
+
diff --git a/qpid/java/testkit/bin/setenv.sh b/qpid/java/testkit/bin/setenv.sh
new file mode 100644
index 0000000000..c2a0c46d55
--- /dev/null
+++ b/qpid/java/testkit/bin/setenv.sh
@@ -0,0 +1,44 @@
+#
+# 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.
+#
+
+# Environment for python tests
+test -d ../../../python || { echo "WARNING: skipping test, no python directory."; exit 0; }
+PYTHON_DIR=../../../python
+PYTHONPATH=$PYTHON_DIR:$PYTHON_DIR/qpid
+
+if [ "$QPIDD_EXEC" = "" ] ; then
+   test -x ../../../cpp/src/qpidd || { echo "WARNING: skipping test, QPIDD_EXEC not set and qpidd not found."; exit 0; }
+   QPIDD_EXEC=../../../cpp/src/qpidd
+fi
+
+if [ "$CLUSTER_LIB" = "" ] ; then
+   test -x ../../../cpp/src/.libs/cluster.so || { echo "WARNING: skipping test, CLUSTER_LIB not set and cluster.so not found."; exit 0; }
+   CLUSTER_LIB=../../../cpp/src/.libs/cluster.so
+fi
+
+if [ "$QP_CP" = "" ] ; then
+   QP_CP=`find ../../build/lib/ -name '*.jar' | tr '\n' ':'`
+fi
+
+if [ "$QUTDIR" = "" ] ; then
+   OUTDIR=../
+fi
+
+
+export PYTHONPATH PYTHON_DIR QPIDD_EXEC CLUSTER_LIB QP_CP OUTDIR