diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/perftests/build.xml | 14 | ||||
| -rw-r--r-- | java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java | 4 |
2 files changed, 15 insertions, 3 deletions
diff --git a/java/perftests/build.xml b/java/perftests/build.xml index 57a92ea514..c59986c06d 100644 --- a/java/perftests/build.xml +++ b/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/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java b/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java index 4ad282b039..e973f07c12 100644 --- a/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java +++ b/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); } } |