QPID-3402: fix excludes files to work with spaces etc in path, make SSL tests use relative path to keystore files to allow parsing the URLs containing them

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1175567 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 1 deletions

diff --git a/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java b/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
index bde8bc68ad..e69f95f916 100644
--- a/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -65,7 +65,7 @@ public class QpidTestCase extends TestCase
             String exclusionListString = System.getProperties().getProperty("test.excludelist", "");
             List<String> exclusionList = new ArrayList<String>();
 
-            for (String uri : exclusionListURIs.split("\\s+"))
+            for (String uri : exclusionListURIs.split(";\\s*"))
             {
                 File file = new File(uri);
                 if (file.exists())
@@ -87,6 +87,10 @@ public class QpidTestCase extends TestCase
                         _logger.warn("Exception when reading exclusion list", e);
                     }
                 }
+                else
+                {
+                    _logger.info("Specified exclude file does not exist: " + uri);
+                }
             }
 
             if (!exclusionListString.equals(""))