summaryrefslogtreecommitdiff
path: root/qpid/java/test-profiles
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java/test-profiles')
-rwxr-xr-xqpid/java/test-profiles/CPPExcludes5
-rw-r--r--qpid/java/test-profiles/Excludes6
2 files changed, 5 insertions, 6 deletions
diff --git a/qpid/java/test-profiles/CPPExcludes b/qpid/java/test-profiles/CPPExcludes
index 0abe665206..1943049a7b 100755
--- a/qpid/java/test-profiles/CPPExcludes
+++ b/qpid/java/test-profiles/CPPExcludes
@@ -172,3 +172,8 @@ org.apache.qpid.scripts.QpidPasswdTest#*
// QPID-3604: Immediate Prefetch no longer supported by 0-10
org.apache.qpid.client.AsynchMessageListenerTest#testImmediatePrefetchWithMessageListener
+
+// QPID-3936: Exclude Performance Test Framework tests
+org.apache.qpid.systest.disttest.*
+org.apache.qpid.disttest.*
+
diff --git a/qpid/java/test-profiles/Excludes b/qpid/java/test-profiles/Excludes
index 4c84babc6c..c0532e0b97 100644
--- a/qpid/java/test-profiles/Excludes
+++ b/qpid/java/test-profiles/Excludes
@@ -31,9 +31,3 @@ org.apache.qpid.server.logging.DerbyMessageStoreLoggingTest#*
org.apache.qpid.client.ssl.SSLTest#testVerifyLocalHostLocalDomain
-// QPID-3936: disable the systests temporarily
-org.apache.qpid.systest.disttest.*
-org.apache.qpid.systest.disttest.clientonly.*
-org.apache.qpid.systest.disttest.controlleronly.*
-org.apache.qpid.systest.disttest.controllerandclient.*
-org.apache.qpid.systest.disttest.endtoend.*