diff options
| author | Keith Wall <kwall@apache.org> | 2012-07-20 13:16:29 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2012-07-20 13:16:29 +0000 |
| commit | 1a12b8ec6af647aff744e9a75be1537be9620713 (patch) | |
| tree | e4aefc49cfecbaee8d59f95cce114212d7f391c4 | |
| parent | 86ec92715e981988e4ff4ce9e6905fac6088d210 (diff) | |
| download | qpid-python-1a12b8ec6af647aff744e9a75be1537be9620713.tar.gz | |
QPID-4143: exclude qpid-client and its third party libs from the perftests release. This makes it easier to run the perftests using an old client version. Also made logging more sensible.
Applied patch from Philip Harvey <phil@philharveyonline.com>.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1363765 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/perftests/build.xml | 14 | ||||
| -rw-r--r-- | qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java | 4 |
2 files changed, 15 insertions, 3 deletions
diff --git a/qpid/java/perftests/build.xml b/qpid/java/perftests/build.xml index 57a92ea514..c59986c06d 100644 --- a/qpid/java/perftests/build.xml +++ b/qpid/java/perftests/build.xml @@ -46,7 +46,19 @@ <target name="release-bin" depends="release-bin-tasks"/> - <target name="copy-etc-release" description="override target from module.xml to set flatten=false"> + <target name="libs-release" description="overridden to not copy depended-on modules or their dependencies, so that a perf tests release is not tied to a particular client version"> + <!-- Copy the module dependencies --> + <echo message="${module.libs}"/> + <echo message="overridden to not copy qpid-client or its dependencies so that this release is not tied to a particular client version"/> + + <copylist todir="${module.release}/lib" dir="${project.root}" files="${module.libs}"/> + <!-- Copy the jar for this module --> + <copy todir="${module.release}/lib" failonerror="true"> + <fileset file="${module.jar}"/> + </copy> + </target> + + <target name="copy-etc-release" description="override target from module.xml to set flatten=false"> <copy todir="${module.release}/etc" failonerror="false" flatten="false"> <fileset dir="${module.etc}"/> </copy> diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java index 4ad282b039..e973f07c12 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java @@ -208,7 +208,7 @@ public class TestRunner { try { - awaitLatch(_testResultsLatch, interval, "Timed out waiting for participant results"); + awaitLatch(_testResultsLatch, interval, "still waiting for participant results"); } catch (DistributedTestException e) { @@ -289,7 +289,7 @@ public class TestRunner { final long latchCount = latch.getCount(); String formattedMessage = "After " + timeout + "ms ... " + message + " ... Expecting " + latchCount + " more responses."; - LOGGER.error(formattedMessage); + LOGGER.info(formattedMessage); // info rather than error because we time out periodically so we can log progress throw new DistributedTestException(formattedMessage); } } |