diff options
| author | Alex Rudyy <orudyy@apache.org> | 2013-01-24 15:40:35 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2013-01-24 15:40:35 +0000 |
| commit | 6a359e9049e06c00e77ddbccb65b7f53cbc4b032 (patch) | |
| tree | 2643945e6b4b61f48e36ac17b3cb44436ac96d9f /qpid/java/test-profiles | |
| parent | 65e21b844f0dd9eebd00f63bba5d8a6f2e0b5188 (diff) | |
| download | qpid-python-6a359e9049e06c00e77ddbccb65b7f53cbc4b032.tar.gz | |
QPID-4281: Fix setting of log4j configuration in system tests. While testing the fix, some tests were found to be failing on spawned profile due to config problems - also fixed these.
Applied patch from Philip Harvey <phil@philharveyonline.com> and myself.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1438053 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/test-profiles')
| -rw-r--r-- | qpid/java/test-profiles/testprofile.defaults | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qpid/java/test-profiles/testprofile.defaults b/qpid/java/test-profiles/testprofile.defaults index 47992b9334..e205de2a18 100644 --- a/qpid/java/test-profiles/testprofile.defaults +++ b/qpid/java/test-profiles/testprofile.defaults @@ -33,7 +33,12 @@ amqj.logging.level=${log} amqj.server.logging.level=${log} amqj.protocol.logging.level=${log} root.logging.level=warn -log4j.configuration=test-profiles/log4j-test.xml + +# System property log4j.configuration is used by log4j. +# QpidBrokerTestCase uses log4j.configuration.file to construct a java.io.File, eg for log configuration of spawned brokers. +log4j.configuration.file=${test.profiles}/log4j-test.xml +log4j.configuration=file:///${log4j.configuration.file} + log4j.debug=false # Note test-provider.properties also has variables of same name. |