diff options
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllCoreTests.java')
-rw-r--r-- | tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllCoreTests.java | 16 |
1 files changed, 10 insertions, 6 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 7f217c7b4..2e55e5724 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,13 +10,15 @@ *******************************************************************************/ package org.eclipse.team.tests.ccvs.core; +import org.eclipse.team.tests.ccvs.core.cvsresources.AllTestsCVSResources; +import org.eclipse.team.tests.ccvs.core.jsch.AllJschTests; + +import org.eclipse.jface.util.Util; + import junit.extensions.TestSetup; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.team.tests.ccvs.core.cvsresources.AllTestsCVSResources; -import org.eclipse.team.tests.ccvs.core.jsch.AllJschTests; - /** * Tests that don't require the Team UI plugin to be loaded. */ @@ -32,8 +34,10 @@ public class AllCoreTests extends EclipseTest { public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(AllTestsCVSResources.suite()); - suite.addTest(AllJschTests.suite()); + if (!Util.isMac()) { // Bug 525817: Disable CVS tests on Mac + suite.addTest(AllTestsCVSResources.suite()); + suite.addTest(AllJschTests.suite()); + } return new TestSetup(suite); } } |