diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-10-06 20:04:48 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-10-06 20:04:48 +0000 |
| commit | c6a7ee5f8f6734cd575a06221c91482bda051338 (patch) | |
| tree | 1fa7900da893ecadddbb89540d90bd5f8c141dab /qpid/java/module.xml | |
| parent | c990cf362892d56923bda018a61e4dd4b236bb55 (diff) | |
| download | qpid-python-c6a7ee5f8f6734cd575a06221c91482bda051338.tar.gz | |
QPID-3346: merge **from** trunk **to** qpid-3346 dev branch
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3346@1179802 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/module.xml')
| -rw-r--r-- | qpid/java/module.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/qpid/java/module.xml b/qpid/java/module.xml index 050382ee80..349fb91e4a 100644 --- a/qpid/java/module.xml +++ b/qpid/java/module.xml @@ -207,7 +207,6 @@ <mkdir dir="${build.etc}"/> <mkdir dir="${build.lib}"/> <mkdir dir="${build.results}"/> - <mkdir dir="${build.data}"/> <mkdir dir="${build.plugins}"/> <mkdir dir="${module.classes}"/> <mkdir dir="${module.precompiled}"/> @@ -317,7 +316,7 @@ <property file="${build.scratch}/test-${profile}.properties"/> <map property="test.excludefiles" value="${test.excludes}"> - <globmapper from="*" to="${test.profiles}/*"/> + <globmapper from="*" to="${test.profiles}/*;"/> </map> <condition property="dontruntest" value="dontruntest" else="runtest"> @@ -335,7 +334,8 @@ <echo message="Using profile:${profile}" level="info"/> <junit fork="yes" forkmode="once" maxmemory="${test.mem}" reloading="no" haltonfailure="${haltonfailure}" haltonerror="${haltonerror}" - failureproperty="test.failures" printsummary="on" timeout="6000000" > + failureproperty="test.failures" printsummary="on" timeout="6000000" + dir="${project.root}" > <jvmarg line="${jvm.args}" /> @@ -660,7 +660,8 @@ <mkdir dir="${build.coveragereport}" /> <junit fork="yes" forkmode="once" maxmemory="${test.mem}" reloading="no" haltonfailure="${haltonfailure}" haltonerror="${haltonerror}" - failureproperty="test.failures" printsummary="on" timeout="600000" > + failureproperty="test.failures" printsummary="on" timeout="600000" + dir="${project.root}" > <sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/> <sysproperty key="amqj.protocol.logging.level" value="${amqj.protocol.logging.level}"/> @@ -670,7 +671,6 @@ <sysproperty key="java.naming.factory.initial" value="${java.naming.factory.initial}"/> <sysproperty key="java.naming.provider.url" value="${java.naming.provider.url}"/> <sysproperty key="broker" value="${broker}"/> - <sysproperty key="broker.clean" value="${broker.clean}"/> <sysproperty key="broker.version" value="${broker.version}"/> <sysproperty key="broker.ready" value="${broker.ready}" /> <sysproperty key="test.output" value="${module.results}"/> |