Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2017-10-11 04:13:29 -0400
committerDani Megert2017-10-11 04:22:31 -0400
commitd8fc41a0831511e8374190b76c5429ecd1437f77 (patch)
tree1c930b43e1c61bdaaeb5c91298bcfde6a44daf17
parent4129dfb7e5bd620165c24b9373b00421b9a85ec1 (diff)
downloadeclipse.platform.team-d8fc41a0831511e8374190b76c5429ecd1437f77.tar.gz
eclipse.platform.team-d8fc41a0831511e8374190b76c5429ecd1437f77.tar.xz
eclipse.platform.team-d8fc41a0831511e8374190b76c5429ecd1437f77.zip
Fixed bug 525817: Disable CVS tests on Mac
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllCoreTests.java11
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java15
2 files changed, 16 insertions, 10 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllCoreTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllCoreTests.java
index 2e55e5724..138e92e3a 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllCoreTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllCoreTests.java
@@ -34,10 +34,13 @@ public class AllCoreTests extends EclipseTest {
public static Test suite() {
TestSuite suite = new TestSuite();
- if (!Util.isMac()) { // Bug 525817: Disable CVS tests on Mac
- suite.addTest(AllTestsCVSResources.suite());
- suite.addTest(AllJschTests.suite());
- }
+
+ // Bug 525817: Disable CVS tests on Mac
+ if (Util.isMac())
+ return suite;
+
+ suite.addTest(AllTestsCVSResources.suite());
+ suite.addTest(AllJschTests.suite());
return new TestSetup(suite);
}
}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java
index 9123a2c7f..927649fd2 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java
@@ -31,12 +31,15 @@ public class AllTests extends EclipseTest {
public static Test suite() {
TestSuite suite = new TestSuite();
- if (!Util.isMac()) { // Bug 525817: Disable CVS tests on Mac
- suite.addTest(AllTestsProvider.suite());
- suite.addTest(AllTestsTeamSubscriber.suite());
- suite.addTest(AllUITests.suite());
- suite.addTest(ResourceMapperTests.suite());
- }
+
+ // Bug 525817: Disable CVS tests on Mac
+ if (Util.isMac())
+ return suite;
+
+ suite.addTest(AllTestsProvider.suite());
+ suite.addTest(AllTestsTeamSubscriber.suite());
+ suite.addTest(AllUITests.suite());
+ suite.addTest(ResourceMapperTests.suite());
return new CVSUITestSetup(suite);
}
}

Back to the top