diff options
author | Dani Megert | 2017-10-10 13:02:39 +0000 |
---|---|---|
committer | Dani Megert | 2017-10-10 13:02:39 +0000 |
commit | 072ddd9fd516d1b6116087c4c4d9ea5a81ad77c6 (patch) | |
tree | 88b3adff9e639a1732494915a33ffd31c9cc6d0f | |
parent | 3c3f1a936df1feb41163e74650b87b6bb1780562 (diff) | |
download | eclipse.platform.team-072ddd9fd516d1b6116087c4c4d9ea5a81ad77c6.tar.gz eclipse.platform.team-072ddd9fd516d1b6116087c4c4d9ea5a81ad77c6.tar.xz eclipse.platform.team-072ddd9fd516d1b6116087c4c4d9ea5a81ad77c6.zip |
Fixed bug 525817: Disable CVS tests on MacI20171011-0305I20171010-2000
2 files changed, 22 insertions, 14 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); } } 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 ae33c20b9..9123a2c7f 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 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 @@ -9,14 +9,16 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.team.tests.ccvs.core; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.team.tests.ccvs.core.mappings.ResourceMapperTests; import org.eclipse.team.tests.ccvs.core.provider.AllTestsProvider; import org.eclipse.team.tests.ccvs.core.subscriber.AllTestsTeamSubscriber; import org.eclipse.team.tests.ccvs.ui.AllUITests; +import org.eclipse.jface.util.Util; + +import junit.framework.Test; +import junit.framework.TestSuite; + public class AllTests extends EclipseTest { public AllTests() { @@ -29,10 +31,12 @@ public class AllTests extends EclipseTest { public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(AllTestsProvider.suite()); - suite.addTest(AllTestsTeamSubscriber.suite()); - suite.addTest(AllUITests.suite()); - suite.addTest(ResourceMapperTests.suite()); + 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()); + } return new CVSUITestSetup(suite); } } |