diff options
| author | Alan Conway <aconway@apache.org> | 2012-05-07 19:54:44 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-05-07 19:54:44 +0000 |
| commit | 1427de0275b5db2c8619db9211435897123259d8 (patch) | |
| tree | 106683fa45f791468507ba0e832b30d12fe41963 | |
| parent | 736b4a8d91342544079ed6b67266e9cc9f64fb76 (diff) | |
| download | qpid-python-1427de0275b5db2c8619db9211435897123259d8.tar.gz | |
NO-JIRA: Skip HA tests if required python tools are not available.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1335218 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/etc/Makefile.am | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/Makefile.am | 7 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/run_ha_tests | 29 |
3 files changed, 35 insertions, 5 deletions
diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am index b154a105d4..aa41c65b37 100644 --- a/qpid/cpp/etc/Makefile.am +++ b/qpid/cpp/etc/Makefile.am @@ -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=\ diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am index 66d2cdd5d5..472de39d0b 100644 --- a/qpid/cpp/src/tests/Makefile.am +++ b/qpid/cpp/src/tests/Makefile.am @@ -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 diff --git a/qpid/cpp/src/tests/run_ha_tests b/qpid/cpp/src/tests/run_ha_tests new file mode 100755 index 0000000000..1a469646c9 --- /dev/null +++ b/qpid/cpp/src/tests/run_ha_tests @@ -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 + |