Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9607699D6 for ; Tue, 8 Nov 2011 14:42:22 +0000 (UTC) Received: (qmail 31085 invoked by uid 500); 8 Nov 2011 14:42:22 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 31062 invoked by uid 500); 8 Nov 2011 14:42:22 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 31055 invoked by uid 99); 8 Nov 2011 14:42:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2011 14:42:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2011 14:42:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 803522388ABA for ; Tue, 8 Nov 2011 14:42:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1199267 - in /qpid/trunk/qpid/cpp/src/tests: Makefile.am cluster.mk testagent.mk Date: Tue, 08 Nov 2011 14:42:00 -0000 To: commits@qpid.apache.org From: aconway@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111108144200.803522388ABA@eris.apache.org> Author: aconway Date: Tue Nov 8 14:41:59 2011 New Revision: 1199267 URL: http://svn.apache.org/viewvc?rev=1199267&view=rev Log: NO-JIRA: Install test executables and scripts. Modified: qpid/trunk/qpid/cpp/src/tests/Makefile.am qpid/trunk/qpid/cpp/src/tests/cluster.mk qpid/trunk/qpid/cpp/src/tests/testagent.mk Modified: qpid/trunk/qpid/cpp/src/tests/Makefile.am URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=1199267&r1=1199266&r2=1199267&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/tests/Makefile.am (original) +++ qpid/trunk/qpid/cpp/src/tests/Makefile.am Tue Nov 8 14:41:59 2011 @@ -51,9 +51,9 @@ CLEAN_LOCAL= qpidexecdir = $(libexecdir)/qpid qpidexec_PROGRAMS = qpidexec_SCRIPTS = -qpidtestdir = $(qpidexecdir)/tests -qpidtest_PROGRAMS = -qpidtest_SCRIPTS = +qpidexectestdir = $(qpidexecdir)/tests +qpidexectest_PROGRAMS = +qpidexectest_SCRIPTS = tmoduledir = $(libdir)/qpid/tests tmodule_LTLIBRARIES= @@ -150,17 +150,17 @@ endif # Test programs that are installed and therefore built as part of make, not make check -qpidtest_SCRIPTS += qpid-cpp-benchmark install_env.sh +qpidexectest_SCRIPTS += qpid-cpp-benchmark install_env.sh EXTRA_DIST += qpid-cpp-benchmark install_env.sh -qpidtest_PROGRAMS += receiver +qpidexectest_PROGRAMS += receiver receiver_SOURCES = \ receiver.cpp \ TestOptions.h \ ConnectionOptions.h receiver_LDADD = $(lib_client) -qpidtest_PROGRAMS += sender +qpidexectest_PROGRAMS += sender sender_SOURCES = \ sender.cpp \ TestOptions.h \ @@ -168,7 +168,7 @@ sender_SOURCES = \ Statistics.cpp sender_LDADD = $(lib_messaging) -qpidtest_PROGRAMS += qpid-receive +qpidexectest_PROGRAMS += qpid-receive qpid_receive_SOURCES = \ qpid-receive.cpp \ TestOptions.h \ @@ -177,7 +177,7 @@ qpid_receive_SOURCES = \ Statistics.cpp qpid_receive_LDADD = $(lib_messaging) -qpidtest_PROGRAMS += qpid-send +qpidexectest_PROGRAMS += qpid-send qpid_send_SOURCES = \ qpid-send.cpp \ TestOptions.h \ @@ -186,37 +186,37 @@ qpid_send_SOURCES = \ Statistics.cpp qpid_send_LDADD = $(lib_messaging) -qpidtest_PROGRAMS+=qpid-perftest +qpidexectest_PROGRAMS+=qpid-perftest qpid_perftest_SOURCES=qpid-perftest.cpp test_tools.h TestOptions.h ConnectionOptions.h qpid_perftest_INCLUDES=$(PUBLIC_INCLUDES) qpid_perftest_LDADD=$(lib_client) -qpidtest_PROGRAMS+=qpid-txtest +qpidexectest_PROGRAMS+=qpid-txtest qpid_txtest_INCLUDES=$(PUBLIC_INCLUDES) qpid_txtest_SOURCES=qpid-txtest.cpp TestOptions.h ConnectionOptions.h qpid_txtest_LDADD=$(lib_client) -qpidtest_PROGRAMS+=qpid-latency-test +qpidexectest_PROGRAMS+=qpid-latency-test qpid_latency_test_INCLUDES=$(PUBLIC_INCLUDES) qpid_latency_test_SOURCES=qpid-latency-test.cpp TestOptions.h ConnectionOptions.h qpid_latency_test_LDADD=$(lib_client) -qpidtest_PROGRAMS+=qpid-client-test +qpidexectest_PROGRAMS+=qpid-client-test qpid_client_test_INCLUDES=$(PUBLIC_INCLUDES) qpid_client_test_SOURCES=qpid-client-test.cpp TestOptions.h ConnectionOptions.h qpid_client_test_LDADD=$(lib_client) -qpidtest_PROGRAMS+=qpid-topic-listener +qpidexectest_PROGRAMS+=qpid-topic-listener qpid_topic_listener_INCLUDES=$(PUBLIC_INCLUDES) qpid_topic_listener_SOURCES=qpid-topic-listener.cpp TestOptions.h ConnectionOptions.h qpid_topic_listener_LDADD=$(lib_client) -qpidtest_PROGRAMS+=qpid-topic-publisher +qpidexectest_PROGRAMS+=qpid-topic-publisher qpid_topic_publisher_INCLUDES=$(PUBLIC_INCLUDES) qpid_topic_publisher_SOURCES=qpid-topic-publisher.cpp TestOptions.h ConnectionOptions.h qpid_topic_publisher_LDADD=$(lib_client) -qpidtest_PROGRAMS+=qpid-ping +qpidexectest_PROGRAMS+=qpid-ping qpid_ping_INCLUDES=$(PUBLIC_INCLUDES) qpid_ping_SOURCES=qpid-ping.cpp test_tools.h TestOptions.h ConnectionOptions.h qpid_ping_LDADD=$(lib_client) Modified: qpid/trunk/qpid/cpp/src/tests/cluster.mk URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster.mk?rev=1199267&r1=1199266&r2=1199267&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/tests/cluster.mk (original) +++ qpid/trunk/qpid/cpp/src/tests/cluster.mk Tue Nov 8 14:41:59 2011 @@ -80,7 +80,7 @@ LONG_TESTS += \ cluster_python_tests \ stop_cluster -qpidtest_PROGRAMS += cluster_test +qpidexectest_PROGRAMS += cluster_test cluster_test_SOURCES = \ cluster_test.cpp \ @@ -96,7 +96,7 @@ cluster_test_SOURCES = \ cluster_test_LDADD=$(lib_client) $(lib_broker) ../cluster.la -lboost_unit_test_framework -qpidtest_SCRIPTS += run_cluster_tests brokertest.py cluster_tests.py cluster_test_logs.py run_long_cluster_tests long_cluster_tests.py testlib.py cluster_tests.fail -qpidtest_SCRIPTS += $(CLUSTER_TEST_SCRIPTS_LIST) +qpidexectest_SCRIPTS += run_cluster_tests brokertest.py cluster_tests.py cluster_test_logs.py run_long_cluster_tests long_cluster_tests.py testlib.py cluster_tests.fail +qpidexectest_SCRIPTS += $(CLUSTER_TEST_SCRIPTS_LIST) endif Modified: qpid/trunk/qpid/cpp/src/tests/testagent.mk URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/testagent.mk?rev=1199267&r1=1199266&r2=1199267&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/tests/testagent.mk (original) +++ qpid/trunk/qpid/cpp/src/tests/testagent.mk Tue Nov 8 14:41:59 2011 @@ -43,7 +43,7 @@ testagent_gen.timestamp: testagent.xml $ CLEANFILES+=$(TESTAGENT_GEN_SRC) testagent_gen.timestamp testagent-testagent.$(OBJEXT): $(TESTAGENT_GEN_SRC) -qpidtest_PROGRAMS+=testagent +qpidexectest_PROGRAMS+=testagent testagent_CXXFLAGS=$(CXXFLAGS) -Itestagent_gen testagent_SOURCES=testagent.cpp $(TESTAGENT_GEN_SRC) testagent_LDADD=$(top_builddir)/src/libqmf.la --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org