From 85bdaaf4b3be99dbffb5a818ef991ef67f57469a Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Fri, 24 Aug 2012 11:35:59 -0700 Subject: [PATCH] Revert "Revert "Allow unreliable tests to be avoided"" This reverts commit c4e80e62a2f2c5bae36dffa6fea5f28a32136bcf. --- .../src/org/eclipse/cdt/alltests/AllTests.java | 15 ++++++++------- .../tests/ErrorParserFileMatchingTest.java | 1 + .../cdt/core/suite/AutomatedIntegrationSuite.java | 12 +++++++++++- .../org/eclipse/cdt/ui/tests/AutomatedSuite.java | 11 ++++++++++- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/core/org.eclipse.cdt.alltests/src/org/eclipse/cdt/alltests/AllTests.java b/core/org.eclipse.cdt.alltests/src/org/eclipse/cdt/alltests/AllTests.java index b04bc09c6cc..2594f0d248f 100644 --- a/core/org.eclipse.cdt.alltests/src/org/eclipse/cdt/alltests/AllTests.java +++ b/core/org.eclipse.cdt.alltests/src/org/eclipse/cdt/alltests/AllTests.java @@ -12,20 +12,21 @@ import junit.framework.TestSuite; public class AllTests extends TestSuite { public static Test suite() throws Exception { final AllTests suite = new AllTests(); - suite.addTest(org.eclipse.cdt.autotools.tests.AllAutotoolsTests.suite()); // Works with MinGW but not Cygwin - - // There are intermittent failures in these tests. No pattern to failures. Seems like indexer is interrupted + suite.addTest(org.eclipse.cdt.autotools.tests.AllAutotoolsTests.suite()); +// // There are intermittent failures in these tests. No pattern to failures. Seems like indexer is interrupted + if (System.getProperty("cdt.skip.known.test.failures") == null) { //$NON-NLS-1$ suite.addTest(org.eclipse.cdt.codan.core.test.AutomatedIntegrationSuite.suite()); suite.addTest(org.eclipse.cdt.core.lrparser.tests.LRParserTestSuite.suite()); suite.addTest(org.eclipse.cdt.core.parser.xlc.tests.suite.XlcTestSuite.suite()); - suite.addTest(org.eclipse.cdt.core.parser.upc.tests.UPCParserTestSuite.suite()); + } suite.addTest(org.eclipse.cdt.core.suite.AutomatedIntegrationSuite.suite()); - // These tests fail intermittently due to gdb not shutting down and thus - // not being able to delete the project (exe locked) + // These tests fail intermittently due to gdb not shutting down and thus + // not being able to delete the project (exe locked) + if (System.getProperty("cdt.skip.known.test.failures") == null) { //$NON-NLS-1$ suite.addTest(org.eclipse.cdt.debug.core.tests.AllDebugTests.suite()); - + } suite.addTest(org.eclipse.cdt.errorparsers.xlc.tests.AllXlcErrorParserTests.suite()); suite.addTest(org.eclipse.cdt.make.core.tests.AutomatedIntegrationSuite.suite()); suite.addTest(org.eclipse.cdt.managedbuilder.tests.suite.AllManagedBuildTests.suite()); diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java index a9252570244..75c7b5f5995 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java @@ -937,6 +937,7 @@ public class ErrorParserFileMatchingTest extends TestCase { // Skip the test if Cygwin is not available. return; } + assertTrue("usrIncludeWindowsPath=["+usrIncludeWindowsPath+"]", usrIncludeWindowsPath.charAt(1)==IPath.DEVICE_SEPARATOR); diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java index 5e7b2090906..3e999a48886 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java @@ -62,12 +62,19 @@ public class AutomatedIntegrationSuite extends TestSuite { public static Test suite() throws Exception { final AutomatedIntegrationSuite suite = new AutomatedIntegrationSuite(); - // Add all success tests + // Add all success tests + + // Has intermittent failures + if (System.getProperty("cdt.skip.known.test.failures") == null) { suite.addTest(CDescriptorTests.suite()); + } suite.addTest(CDescriptorOldTests.suite()); suite.addTest(IEnvironmentVariableManagerTests.suite()); suite.addTest(ErrorParserTests.suite()); + // Has intermittent failures + if (System.getProperty("cdt.skip.known.test.failures") == null) { suite.addTest(ParserTestSuite.suite()); + } suite.addTest(AllCoreTests.suite()); suite.addTest(ElementDeltaTests.suite()); suite.addTest(WorkingCopyTests.suite()); @@ -84,9 +91,12 @@ public class AutomatedIntegrationSuite extends TestSuite { suite.addTest(EFSExtensionTests.suite()); suite.addTest(ByteUtilsTest.suite()); + // Has intermittent failures + if (System.getProperty("cdt.skip.known.test.failures") == null) { //$NON-NLS-1$ // Add in PDOM tests suite.addTest(PDOMTests.suite()); suite.addTest(IndexTests.suite()); + } suite.addTest(RefreshScopeTests.suite()); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java index 7b5affd6f35..cb45f1e99c3 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java @@ -61,8 +61,11 @@ public class AutomatedSuite extends TestSuite { // tests for package org.eclipse.cdt.ui.tests.viewsupport addTest(ViewSupportTestSuite.suite()); + // Has intermittent failures + if (System.getProperty("cdt.skip.known.test.failures") == null) { //$NON-NLS-1$ // tests for package org.eclipse.cdt.ui.tests.callhierarchy addTest(CallHierarchyTestSuite.suite()); + } // tests for package org.eclipse.cdt.ui.tests.typehierarchy addTest(TypeHierarchyTestSuite.suite()); @@ -75,9 +78,12 @@ public class AutomatedSuite extends TestSuite { // tests from package org.eclipse.cdt.ui.tests.text.contentAssist2 addTest(ContentAssist2TestSuite.suite()); - + + // Has intermittent failures + if (System.getProperty("cdt.skip.known.test.failures") == null) { //$NON-NLS-1$ // tests from package org.eclipse.cdt.ui.tests.text.selection addTest(SelectionTestSuite.suite()); + } // tests from package org.eclipse.cdt.ui.tests.quickfix addTest(AssistQuickFixTest.suite()); @@ -88,8 +94,11 @@ public class AutomatedSuite extends TestSuite { // tests from package org.eclipse.cdt.ui.tests.search addTest(SearchTestSuite.suite()); + // Has intermittent failures + if (System.getProperty("cdt.skip.known.test.failures") == null) { //$NON-NLS-1$ // tests from package org.eclipse.cdt.ui.tests.refactoring addTest(RefactoringTestSuite.suite()); + } // tests from package org.eclipse.cdt.ui.tests.chelp addTest(CHelpTest.suite());