Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@qpid.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1335218 - in /qpid/trunk/qpid/cpp: etc/Makefile.am
 src/tests/Makefile.am src/tests/run_ha_tests
Date: Mon, 07 May 2012 19:54:44 -0000
To: commits@qpid.apache.org
From: aconway@apache.org
Message-Id: <20120507195444.AE90D238896F@eris.apache.org>

Author: aconway
Date: Mon May  7 19:54:44 2012
New Revision: 1335218

URL: http://svn.apache.org/viewvc?rev=1335218&view=rev
Log:
NO-JIRA: Skip HA tests if required python tools are not available.

Added:
    qpid/trunk/qpid/cpp/src/tests/run_ha_tests   (with props)
Modified:
    qpid/trunk/qpid/cpp/etc/Makefile.am
    qpid/trunk/qpid/cpp/src/tests/Makefile.am

Modified: qpid/trunk/qpid/cpp/etc/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/Makefile.am?rev=1335218&r1=1335217&r2=1335218&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/etc/Makefile.am Mon May  7 19:54:44 2012
@@ -20,8 +20,8 @@ SASL_CONF = sasl2/qpidd.conf
 
 EXTRA_DIST = \
 	$(SASL_CONF) \
-	qpidd qpidd-primary qpidd.conf qpidc.conf CMakeLists.txt \
-	cluster.conf-example.xml
+	qpidd.in qpidd-primary.in qpidd.conf qpidc.conf CMakeLists.txt \
+	cluster.conf-example.xml.in
 
 confdir = $(sysconfdir)/qpid
 nobase_conf_DATA=\

Modified: qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=1335218&r1=1335217&r2=1335218&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/tests/Makefile.am Mon May  7 19:54:44 2012
@@ -150,7 +150,7 @@ endif
 # Test programs that are installed and therefore built as part of make, not make check
 
 qpidexectest_SCRIPTS += qpid-cpp-benchmark qpid-cluster-benchmark install_env.sh
-EXTRA_DIST += qpid-cpp-benchmark install_env.sh
+EXTRA_DIST += qpid-cpp-benchmark qpid-cluster-benchmark install_env.sh
 
 qpidexectest_PROGRAMS += receiver
 receiver_SOURCES = \
@@ -305,7 +305,7 @@ TESTS_ENVIRONMENT = \
 system_tests = qpid-client-test quick_perftest quick_topictest run_header_test quick_txtest \
   run_msg_group_tests
 TESTS += start_broker $(system_tests) python_tests stop_broker \
-  ha_tests.py run_federation_tests run_federation_sys_tests \
+  run_ha_tests run_federation_tests run_federation_sys_tests \
   run_acl_tests run_cli_tests replication_test dynamic_log_level_test \
   run_queue_flow_limit_tests ipv6_test
 
@@ -352,7 +352,8 @@ EXTRA_DIST +=								\
   run_queue_flow_limit_tests						\
   run_msg_group_tests							\
   ipv6_test								\
-  ha_tests.py							\
+  run_ha_tests								\
+  ha_tests.py								\
   test_env.ps1.in
 
 check_LTLIBRARIES += libdlclose_noop.la

Added: qpid/trunk/qpid/cpp/src/tests/run_ha_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_ha_tests?rev=1335218&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_ha_tests (added)
+++ qpid/trunk/qpid/cpp/src/tests/run_ha_tests Mon May  7 19:54:44 2012
@@ -0,0 +1,29 @@
+#!/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.
+#
+
+
+# Make sure the python tools are available. They will be if we are building in
+# a checkoug, they may not be in a distribution.
+test -d $PYTHON_COMMANDS -a -x $PYTHON_COMMANDS/qpid-ha -a -x $PYTHON_COMMANDS/qpid-config || { echo "Skipping HA tests, qpid-ha or qpid-config not available."; exit 0; }
+
+srcdir=`dirname $0`
+$srcdir/ha_tests.py
+

Propchange: qpid/trunk/qpid/cpp/src/tests/run_ha_tests
------------------------------------------------------------------------------
    svn:executable = *


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org