From 6aefe76491fd30ee2fe9f29df7c448f02aa15e6f Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Wed, 16 Mar 2016 19:05:39 -0400 Subject: [PATCH] gdb catchpoints registers tests cleanup Change-Id: Ibea6071b9b8e07f63508e177fabf8e60da5c0a08 --- dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml | 2 +- .../framework/BaseParametrizedTestCase.java | 6 -- .../tests/dsf/gdb/tests/AutomatedSuite.java | 1 + .../tests/dsf/gdb/tests/MIRegistersTest.java | 8 +- .../cdt/tests/dsf/gdb/tests/SuiteGdb.java | 54 ++------------ .../dsf/gdb/tests/SuiteGdbVersioned.java | 74 +++++++++++++++++++ .../tests_6_6/MICatchpointsTest_6_6.java | 24 ------ .../tests/tests_6_6/MIRegistersTest_6_6.java | 24 ------ .../dsf/gdb/tests/tests_6_6/Suite_6_6.java | 6 +- .../gdb/tests/tests_6_6/Suite_Remote_6_6.java | 6 +- .../tests_6_7/MICatchpointsTest_6_7.java | 24 ------ .../tests/tests_6_7/MIRegistersTest_6_7.java | 24 ------ .../dsf/gdb/tests/tests_6_7/Suite_6_7.java | 6 +- .../gdb/tests/tests_6_7/Suite_Remote_6_7.java | 6 +- .../tests_6_8/MICatchpointsTest_6_8.java | 24 ------ .../tests/tests_6_8/MIRegistersTest_6_8.java | 24 ------ .../dsf/gdb/tests/tests_6_8/Suite_6_8.java | 6 +- .../gdb/tests/tests_6_8/Suite_Remote_6_8.java | 6 +- .../tests_7_0/MICatchpointsTest_7_0.java | 24 ------ .../tests/tests_7_0/MIRegistersTest_7_0.java | 24 ------ .../dsf/gdb/tests/tests_7_0/Suite_7_0.java | 6 +- .../gdb/tests/tests_7_0/Suite_Remote_7_0.java | 6 +- .../tests_7_1/MICatchpointsTest_7_1.java | 24 ------ .../tests/tests_7_1/MIRegistersTest_7_1.java | 24 ------ .../dsf/gdb/tests/tests_7_1/Suite_7_1.java | 6 +- .../gdb/tests/tests_7_1/Suite_Remote_7_1.java | 6 +- .../tests_7_10/MICatchpointsTest_7_10.java | 24 ------ .../tests_7_10/MIRegistersTest_7_10.java | 24 ------ .../dsf/gdb/tests/tests_7_10/Suite_7_10.java | 6 +- .../tests/tests_7_10/Suite_Remote_7_10.java | 6 +- .../tests_7_11/MICatchpointsTest_7_11.java | 21 ------ .../tests_7_11/MIRegistersTest_7_11.java | 21 ------ .../dsf/gdb/tests/tests_7_11/Suite_7_11.java | 6 +- .../tests/tests_7_11/Suite_Remote_7_11.java | 6 +- .../tests_7_2/MICatchpointsTest_7_2.java | 24 ------ .../tests/tests_7_2/MIRegistersTest_7_2.java | 24 ------ .../dsf/gdb/tests/tests_7_2/Suite_7_2.java | 6 +- .../gdb/tests/tests_7_2/Suite_Remote_7_2.java | 6 +- .../tests_7_3/MICatchpointsTest_7_3.java | 24 ------ .../tests/tests_7_3/MIRegistersTest_7_3.java | 24 ------ .../dsf/gdb/tests/tests_7_3/Suite_7_3.java | 6 +- .../gdb/tests/tests_7_3/Suite_Remote_7_3.java | 6 +- .../tests_7_4/MICatchpointsTest_7_4.java | 24 ------ .../tests/tests_7_4/MIRegistersTest_7_4.java | 24 ------ .../tests_7_4/StepIntoSelectionTest_7_4.java | 2 +- .../dsf/gdb/tests/tests_7_4/Suite_7_4.java | 6 +- .../gdb/tests/tests_7_4/Suite_Remote_7_4.java | 6 +- .../tests_7_5/MICatchpointsTest_7_5.java | 24 ------ .../tests/tests_7_5/MIRegistersTest_7_5.java | 24 ------ .../dsf/gdb/tests/tests_7_5/Suite_7_5.java | 6 +- .../gdb/tests/tests_7_5/Suite_Remote_7_5.java | 6 +- .../tests_7_6/MICatchpointsTest_7_6.java | 24 ------ .../tests/tests_7_6/MIRegistersTest_7_6.java | 24 ------ .../dsf/gdb/tests/tests_7_6/Suite_7_6.java | 6 +- .../gdb/tests/tests_7_6/Suite_Remote_7_6.java | 6 +- .../tests_7_7/MICatchpointsTest_7_7.java | 24 ------ .../tests/tests_7_7/MIRegistersTest_7_7.java | 24 ------ .../dsf/gdb/tests/tests_7_7/Suite_7_7.java | 6 +- .../gdb/tests/tests_7_7/Suite_Remote_7_7.java | 6 +- .../tests_7_8/MICatchpointsTest_7_8.java | 24 ------ .../tests/tests_7_8/MIRegistersTest_7_8.java | 24 ------ .../dsf/gdb/tests/tests_7_8/Suite_7_8.java | 6 +- .../gdb/tests/tests_7_8/Suite_Remote_7_8.java | 6 +- .../tests_7_9/MICatchpointsTest_7_9.java | 24 ------ .../tests/tests_7_9/MIRegistersTest_7_9.java | 24 ------ .../dsf/gdb/tests/tests_7_9/Suite_7_9.java | 6 +- .../gdb/tests/tests_7_9/Suite_Remote_7_9.java | 6 +- 67 files changed, 207 insertions(+), 834 deletions(-) create mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SuiteGdbVersioned.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/MICatchpointsTest_6_6.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/MIRegistersTest_6_6.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/MICatchpointsTest_6_7.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/MIRegistersTest_6_7.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/MICatchpointsTest_6_8.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/MIRegistersTest_6_8.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/MICatchpointsTest_7_0.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/MIRegistersTest_7_0.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/MICatchpointsTest_7_1.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/MIRegistersTest_7_1.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/MICatchpointsTest_7_10.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/MIRegistersTest_7_10.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/MICatchpointsTest_7_11.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/MIRegistersTest_7_11.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MICatchpointsTest_7_2.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MIRegistersTest_7_2.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/MICatchpointsTest_7_3.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/MIRegistersTest_7_3.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/MICatchpointsTest_7_4.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/MIRegistersTest_7_4.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/MICatchpointsTest_7_5.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/MIRegistersTest_7_5.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/MICatchpointsTest_7_6.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/MIRegistersTest_7_6.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/MICatchpointsTest_7_7.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/MIRegistersTest_7_7.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/MICatchpointsTest_7_8.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/MIRegistersTest_7_8.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/MICatchpointsTest_7_9.java delete mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/MIRegistersTest_7_9.java diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml index 073c486e4f5..02024fcd133 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml @@ -19,7 +19,7 @@ /shared/common/gdb/gdb-all/bin AutomatedSuite.java 1 - gdb.7.11,gdbserver.7.11 + gdb.7.11 diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseParametrizedTestCase.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseParametrizedTestCase.java index 9af11771574..bb6158d84c0 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseParametrizedTestCase.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseParametrizedTestCase.java @@ -18,7 +18,6 @@ import java.util.List; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; import org.eclipse.cdt.dsf.gdb.launching.LaunchUtils; -import org.junit.AfterClass; import org.junit.Assume; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -134,9 +133,4 @@ public abstract class BaseParametrizedTestCase extends BaseTestCase { IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE); } } - - @AfterClass - public static void afterClass() { - BaseParametrizedTestCase.resetGlobalState(); - } } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/AutomatedSuite.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/AutomatedSuite.java index dcf4137dce7..893727f881e 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/AutomatedSuite.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/AutomatedSuite.java @@ -20,6 +20,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ SuiteGdb.class, + SuiteGdbVersioned.class, }) public class AutomatedSuite { } \ No newline at end of file diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java index 5bd4ddb6b5d..5f66226affc 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java @@ -63,17 +63,17 @@ import org.eclipse.cdt.dsf.mi.service.command.events.MIStoppedEvent; import org.eclipse.cdt.dsf.mi.service.command.output.MIDataListRegisterNamesInfo; import org.eclipse.cdt.dsf.service.DsfServicesTracker; import org.eclipse.cdt.dsf.service.DsfSession; -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; +import org.eclipse.cdt.tests.dsf.gdb.framework.BaseParametrizedTestCase; import org.eclipse.cdt.tests.dsf.gdb.framework.ServiceEventWaitor; import org.eclipse.cdt.tests.dsf.gdb.framework.SyncUtil; import org.eclipse.cdt.tests.dsf.gdb.launching.TestsPlugin; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; -@RunWith(BackgroundRunner.class) -public class MIRegistersTest extends BaseTestCase { +@RunWith(Parameterized.class) +public class MIRegistersTest extends BaseParametrizedTestCase { // Static list of register names as obtained directly from GDB. // We make it static it does not get re-set for every test protected static List fRegisterNames = null; diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SuiteGdb.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SuiteGdb.java index d1ca3a85347..fa39848cae1 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SuiteGdb.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SuiteGdb.java @@ -11,28 +11,6 @@ package org.eclipse.cdt.tests.dsf.gdb.tests; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseParametrizedTestCase; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.CommandTimeoutTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.GDBConsoleBreakpointsTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.GDBConsoleSynchronizingTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.GDBMultiNonStopRunControlTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.GDBPatternMatchingExpressionsTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.GDBProcessesTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.LaunchConfigurationAndRestartTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MICatchpointsTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIDisassemblyTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIExpressionsNonStopTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIExpressionsTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIMemoryTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIRegistersTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIRunControlNonStopTargetAvailableTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIRunControlTargetAvailableTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIRunControlTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.OperationsWhileTargetIsRunningNonStopTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.OperationsWhileTargetIsRunningTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.PostMortemCoreTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.SourceLookupTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.StepIntoSelectionNonStopTest_7_11; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.StepIntoSelectionTest_7_11; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -43,35 +21,15 @@ import org.junit.runners.Suite; * If you running this from IDE use java var to control version like this -Dcdt.tests.dsf.gdb.versions=gdb.7.7,gdbserver.7.7 * If you don't it will run default gdb (without version postfix) for new tests. It will run 7.11 for all non-converted tests. * - * If you adding a new test class do not use gdb version naming. Use flat version extending BaseParametrizedTestCase, - * see {@link MIBreakpointsTest} + * If you adding a new test class do not use gdb version naming. + * Use flat version extending BaseParametrizedTestCase see {@link MIBreakpointsTest} */ @RunWith(Suite.class) @Suite.SuiteClasses({ - // temporary we still use hardcoded gdb version name, we will slowly flatten them - MIRegistersTest_7_11.class, - MIRunControlTest_7_11.class, - MIRunControlTargetAvailableTest_7_11.class, - MIRunControlNonStopTargetAvailableTest_7_11.class, - MIExpressionsTest_7_11.class, - MIExpressionsNonStopTest_7_11.class, - GDBPatternMatchingExpressionsTest_7_11.class, - MIMemoryTest_7_11.class, - MIBreakpointsTest.class, // this is flat version - MICatchpointsTest_7_11.class, - MIDisassemblyTest_7_11.class, - GDBProcessesTest_7_11.class, - LaunchConfigurationAndRestartTest_7_11.class, - OperationsWhileTargetIsRunningTest_7_11.class, - OperationsWhileTargetIsRunningNonStopTest_7_11.class, - PostMortemCoreTest_7_11.class, - CommandTimeoutTest_7_11.class, - GDBMultiNonStopRunControlTest_7_11.class, - GDBConsoleBreakpointsTest_7_11.class, - GDBConsoleSynchronizingTest_7_11.class, - StepIntoSelectionTest_7_11.class, - StepIntoSelectionNonStopTest_7_11.class, - SourceLookupTest_7_11.class, + // new style tests + MIBreakpointsTest.class, + MICatchpointsTest.class, + MIRegistersTest.class, /* Add your test class here */ }) public class SuiteGdb { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SuiteGdbVersioned.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SuiteGdbVersioned.java new file mode 100644 index 00000000000..fbe18a7d5e8 --- /dev/null +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SuiteGdbVersioned.java @@ -0,0 +1,74 @@ +/******************************************************************************* + * Copyright (c) 2016 QNX Software System 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Elena Laskavaia (QNX Software System) - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.tests.dsf.gdb.tests; + +import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.CommandTimeoutTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.GDBConsoleBreakpointsTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.GDBConsoleSynchronizingTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.GDBMultiNonStopRunControlTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.GDBPatternMatchingExpressionsTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.GDBProcessesTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.LaunchConfigurationAndRestartTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIDisassemblyTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIExpressionsNonStopTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIExpressionsTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIMemoryTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIRunControlNonStopTargetAvailableTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIRunControlTargetAvailableTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.MIRunControlTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.OperationsWhileTargetIsRunningNonStopTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.OperationsWhileTargetIsRunningTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.PostMortemCoreTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.SourceLookupTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.StepIntoSelectionNonStopTest_7_11; +import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11.StepIntoSelectionTest_7_11; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * This suite is for tests to be run with GDB. + * + * Do not change this unless you flattening the tests, these are old style test not converted yet + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + // temporary we still use hardcoded gdb version name, we will slowly flatten them + MIRunControlTest_7_11.class, + MIRunControlTargetAvailableTest_7_11.class, + MIRunControlNonStopTargetAvailableTest_7_11.class, + MIExpressionsTest_7_11.class, + MIExpressionsNonStopTest_7_11.class, + GDBPatternMatchingExpressionsTest_7_11.class, + MIMemoryTest_7_11.class, + MIDisassemblyTest_7_11.class, + GDBProcessesTest_7_11.class, + LaunchConfigurationAndRestartTest_7_11.class, + OperationsWhileTargetIsRunningTest_7_11.class, + OperationsWhileTargetIsRunningNonStopTest_7_11.class, + PostMortemCoreTest_7_11.class, + CommandTimeoutTest_7_11.class, + GDBMultiNonStopRunControlTest_7_11.class, + GDBConsoleBreakpointsTest_7_11.class, + GDBConsoleSynchronizingTest_7_11.class, + StepIntoSelectionTest_7_11.class, + StepIntoSelectionNonStopTest_7_11.class, + SourceLookupTest_7_11.class, + /* DO NOT ADD MORE TESTS HERE: User SuiteGdb for new style tests */ +}) +public class SuiteGdbVersioned { + @BeforeClass + public static void beforeClassMethod() { + BaseTestCase.setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_11); + BaseTestCase.ignoreIfGDBMissing(); + } +} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/MICatchpointsTest_6_6.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/MICatchpointsTest_6_6.java deleted file mode 100644 index 0d9cb26b0ec..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/MICatchpointsTest_6_6.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_6; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_6_6 extends MICatchpointsTest { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_6_6); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/MIRegistersTest_6_6.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/MIRegistersTest_6_6.java deleted file mode 100644 index dfb6f89addc..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/MIRegistersTest_6_6.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson AB - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_6; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_6_6 extends MIRegistersTest { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_6_6); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/Suite_6_6.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/Suite_6_6.java index 0f350e26146..c0228b975fe 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/Suite_6_6.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/Suite_6_6.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_6; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -31,14 +33,14 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_6_6.class, + MIRegistersTest.class, MIRunControlTest_6_6.class, MIRunControlTargetAvailableTest_6_6.class, MIExpressionsTest_6_6.class, GDBPatternMatchingExpressionsTest_6_6.class, MIMemoryTest_6_6.class, MIBreakpointsTest.class, - MICatchpointsTest_6_6.class, + MICatchpointsTest.class, MIDisassemblyTest_6_6.class, GDBProcessesTest_6_6.class, LaunchConfigurationAndRestartTest_6_6.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/Suite_Remote_6_6.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/Suite_Remote_6_6.java index fe19f6060bb..34b25a0c3f4 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/Suite_Remote_6_6.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_6/Suite_Remote_6_6.java @@ -16,6 +16,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -32,14 +34,14 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_6_6.class, + MIRegistersTest.class, MIRunControlTest_6_6.class, MIRunControlTargetAvailableTest_6_6.class, MIExpressionsTest_6_6.class, GDBPatternMatchingExpressionsTest_6_6.class, MIMemoryTest_6_6.class, MIBreakpointsTest.class, - MICatchpointsTest_6_6.class, + MICatchpointsTest.class, MIDisassemblyTest_6_6.class, GDBProcessesTest_6_6.class, OperationsWhileTargetIsRunningTest_6_6.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/MICatchpointsTest_6_7.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/MICatchpointsTest_6_7.java deleted file mode 100644 index 9dba8420c12..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/MICatchpointsTest_6_7.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_7; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_6.MICatchpointsTest_6_6; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_6_7 extends MICatchpointsTest_6_6 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_6_7); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/MIRegistersTest_6_7.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/MIRegistersTest_6_7.java deleted file mode 100644 index 4e37d93b43e..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/MIRegistersTest_6_7.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson AB - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_7; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_6.MIRegistersTest_6_6; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_6_7 extends MIRegistersTest_6_6 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_6_7); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/Suite_6_7.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/Suite_6_7.java index c24807d9d20..2c024ee4981 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/Suite_6_7.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/Suite_6_7.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_7; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -31,14 +33,14 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_6_7.class, + MIRegistersTest.class, MIRunControlTest_6_7.class, MIRunControlTargetAvailableTest_6_7.class, MIExpressionsTest_6_7.class, GDBPatternMatchingExpressionsTest_6_7.class, MIMemoryTest_6_7.class, MIBreakpointsTest.class, - MICatchpointsTest_6_7.class, + MICatchpointsTest.class, MIDisassemblyTest_6_7.class, GDBProcessesTest_6_7.class, LaunchConfigurationAndRestartTest_6_7.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/Suite_Remote_6_7.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/Suite_Remote_6_7.java index f0fbf65dff5..7a2aafc54be 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/Suite_Remote_6_7.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_7/Suite_Remote_6_7.java @@ -16,6 +16,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -32,14 +34,14 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_6_7.class, + MIRegistersTest.class, MIRunControlTest_6_7.class, MIRunControlTargetAvailableTest_6_7.class, MIExpressionsTest_6_7.class, GDBPatternMatchingExpressionsTest_6_7.class, MIMemoryTest_6_7.class, MIBreakpointsTest.class, - MICatchpointsTest_6_7.class, + MICatchpointsTest.class, MIDisassemblyTest_6_7.class, GDBProcessesTest_6_7.class, OperationsWhileTargetIsRunningTest_6_7.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/MICatchpointsTest_6_8.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/MICatchpointsTest_6_8.java deleted file mode 100644 index b329b554e30..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/MICatchpointsTest_6_8.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_8; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_7.MICatchpointsTest_6_7; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_6_8 extends MICatchpointsTest_6_7 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_6_8); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/MIRegistersTest_6_8.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/MIRegistersTest_6_8.java deleted file mode 100644 index e1304d2af7e..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/MIRegistersTest_6_8.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson AB - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_8; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_7.MIRegistersTest_6_7; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_6_8 extends MIRegistersTest_6_7 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_6_8); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/Suite_6_8.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/Suite_6_8.java index 5c539ffa078..eb0516b33ec 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/Suite_6_8.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/Suite_6_8.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_8; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -31,14 +33,14 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_6_8.class, + MIRegistersTest.class, MIRunControlTest_6_8.class, MIRunControlTargetAvailableTest_6_8.class, MIExpressionsTest_6_8.class, GDBPatternMatchingExpressionsTest_6_8.class, MIMemoryTest_6_8.class, MIBreakpointsTest.class, - MICatchpointsTest_6_8.class, + MICatchpointsTest.class, MIDisassemblyTest_6_8.class, GDBProcessesTest_6_8.class, LaunchConfigurationAndRestartTest_6_8.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/Suite_Remote_6_8.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/Suite_Remote_6_8.java index 0cc3f58ddc1..1d9ec494f00 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/Suite_Remote_6_8.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_6_8/Suite_Remote_6_8.java @@ -16,6 +16,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -32,14 +34,14 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_6_8.class, + MIRegistersTest.class, MIRunControlTest_6_8.class, MIRunControlTargetAvailableTest_6_8.class, MIExpressionsTest_6_8.class, GDBPatternMatchingExpressionsTest_6_8.class, MIMemoryTest_6_8.class, MIBreakpointsTest.class, - MICatchpointsTest_6_8.class, + MICatchpointsTest.class, MIDisassemblyTest_6_8.class, GDBProcessesTest_6_8.class, OperationsWhileTargetIsRunningTest_6_8.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/MICatchpointsTest_7_0.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/MICatchpointsTest_7_0.java deleted file mode 100644 index 046d1aee324..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/MICatchpointsTest_7_0.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_0; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_8.MICatchpointsTest_6_8; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_7_0 extends MICatchpointsTest_6_8 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_0); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/MIRegistersTest_7_0.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/MIRegistersTest_7_0.java deleted file mode 100644 index d691a5c928e..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/MIRegistersTest_7_0.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson AB - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_0; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_6_8.MIRegistersTest_6_8; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_7_0 extends MIRegistersTest_6_8 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_0); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/Suite_7_0.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/Suite_7_0.java index dd7678752bf..949898678b1 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/Suite_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/Suite_7_0.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_0; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -32,7 +34,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_7_0.class, + MIRegistersTest.class, MIRunControlTest_7_0.class, MIRunControlTargetAvailableTest_7_0.class, MIRunControlNonStopTargetAvailableTest_7_0.class, @@ -41,7 +43,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_0.class, MIMemoryTest_7_0.class, MIBreakpointsTest.class, - MICatchpointsTest_7_0.class, + MICatchpointsTest.class, MIDisassemblyTest_7_0.class, GDBProcessesTest_7_0.class, LaunchConfigurationAndRestartTest_7_0.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/Suite_Remote_7_0.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/Suite_Remote_7_0.java index 227f215b1d5..637267e9461 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/Suite_Remote_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/Suite_Remote_7_0.java @@ -17,6 +17,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -34,7 +36,7 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBRemoteTracepointsTest_7_0.class, - MIRegistersTest_7_0.class, + MIRegistersTest.class, MIRunControlTargetAvailableTest_7_0.class, MIRunControlNonStopTargetAvailableTest_7_0.class, MIRunControlTest_7_0.class, @@ -43,7 +45,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_0.class, MIMemoryTest_7_0.class, MIBreakpointsTest.class, - MICatchpointsTest_7_0.class, + MICatchpointsTest.class, MIDisassemblyTest_7_0.class, GDBProcessesTest_7_0.class, OperationsWhileTargetIsRunningTest_7_0.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/MICatchpointsTest_7_1.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/MICatchpointsTest_7_1.java deleted file mode 100644 index a0e5bb27ff3..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/MICatchpointsTest_7_1.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_1; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_0.MICatchpointsTest_7_0; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_7_1 extends MICatchpointsTest_7_0 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_1); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/MIRegistersTest_7_1.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/MIRegistersTest_7_1.java deleted file mode 100644 index b36606d1863..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/MIRegistersTest_7_1.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson AB - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_1; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_0.MIRegistersTest_7_0; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_7_1 extends MIRegistersTest_7_0 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_1); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/Suite_7_1.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/Suite_7_1.java index a854eab8679..fa8c53ce331 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/Suite_7_1.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/Suite_7_1.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_1; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -32,7 +34,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_7_1.class, + MIRegistersTest.class, MIRunControlTest_7_1.class, MIRunControlTargetAvailableTest_7_1.class, MIRunControlNonStopTargetAvailableTest_7_1.class, @@ -41,7 +43,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_1.class, MIMemoryTest_7_1.class, MIBreakpointsTest.class, - MICatchpointsTest_7_1.class, + MICatchpointsTest.class, MIDisassemblyTest_7_1.class, GDBProcessesTest_7_1.class, LaunchConfigurationAndRestartTest_7_1.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/Suite_Remote_7_1.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/Suite_Remote_7_1.java index 02f838554b6..c43db82e3fd 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/Suite_Remote_7_1.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_1/Suite_Remote_7_1.java @@ -17,6 +17,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -34,7 +36,7 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBRemoteTracepointsTest_7_1.class, - MIRegistersTest_7_1.class, + MIRegistersTest.class, MIRunControlTargetAvailableTest_7_1.class, MIRunControlNonStopTargetAvailableTest_7_1.class, MIRunControlTest_7_1.class, @@ -43,7 +45,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_1.class, MIMemoryTest_7_1.class, MIBreakpointsTest.class, - MICatchpointsTest_7_1.class, + MICatchpointsTest.class, MIDisassemblyTest_7_1.class, GDBProcessesTest_7_1.class, OperationsWhileTargetIsRunningTest_7_1.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/MICatchpointsTest_7_10.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/MICatchpointsTest_7_10.java deleted file mode 100644 index c7fa31066e7..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/MICatchpointsTest_7_10.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_10; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_9.MICatchpointsTest_7_9; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_7_10 extends MICatchpointsTest_7_9 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_10); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/MIRegistersTest_7_10.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/MIRegistersTest_7_10.java deleted file mode 100644 index 93268a1be42..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/MIRegistersTest_7_10.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_10; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_9.MIRegistersTest_7_9; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_7_10 extends MIRegistersTest_7_9 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_10); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/Suite_7_10.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/Suite_7_10.java index c44c960ecad..a498e8ceae7 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/Suite_7_10.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/Suite_7_10.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_10; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -31,7 +33,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_7_10.class, + MIRegistersTest.class, MIRunControlTest_7_10.class, MIRunControlTargetAvailableTest_7_10.class, MIRunControlNonStopTargetAvailableTest_7_10.class, @@ -40,7 +42,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_10.class, MIMemoryTest_7_10.class, MIBreakpointsTest.class, - MICatchpointsTest_7_10.class, + MICatchpointsTest.class, MIDisassemblyTest_7_10.class, GDBProcessesTest_7_10.class, LaunchConfigurationAndRestartTest_7_10.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/Suite_Remote_7_10.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/Suite_Remote_7_10.java index eea3ba28056..009fa27f74d 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/Suite_Remote_7_10.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_10/Suite_Remote_7_10.java @@ -16,6 +16,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -34,7 +36,7 @@ import org.junit.runners.Suite; // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBMultiNonStopRunControlTest_7_10.class, GDBRemoteTracepointsTest_7_10.class, - MIRegistersTest_7_10.class, + MIRegistersTest.class, MIRunControlTest_7_10.class, MIRunControlTargetAvailableTest_7_10.class, MIRunControlNonStopTargetAvailableTest_7_10.class, @@ -43,7 +45,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_10.class, MIMemoryTest_7_10.class, MIBreakpointsTest.class, - MICatchpointsTest_7_10.class, + MICatchpointsTest.class, MIDisassemblyTest_7_10.class, GDBProcessesTest_7_10.class, OperationsWhileTargetIsRunningTest_7_10.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/MICatchpointsTest_7_11.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/MICatchpointsTest_7_11.java deleted file mode 100644 index 49e97380e32..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/MICatchpointsTest_7_11.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_10.MICatchpointsTest_7_10; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_7_11 extends MICatchpointsTest_7_10 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_11); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/MIRegistersTest_7_11.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/MIRegistersTest_7_11.java deleted file mode 100644 index 5c0cfbf27a0..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/MIRegistersTest_7_11.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_10.MIRegistersTest_7_10; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_7_11 extends MIRegistersTest_7_10 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_11); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/Suite_7_11.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/Suite_7_11.java index a03e429afa0..499a13a944a 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/Suite_7_11.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/Suite_7_11.java @@ -10,6 +10,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_11; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -26,7 +28,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_7_11.class, + MIRegistersTest.class, MIRunControlTest_7_11.class, MIRunControlTargetAvailableTest_7_11.class, MIRunControlNonStopTargetAvailableTest_7_11.class, @@ -35,7 +37,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_11.class, MIMemoryTest_7_11.class, MIBreakpointsTest.class, - MICatchpointsTest_7_11.class, + MICatchpointsTest.class, MIDisassemblyTest_7_11.class, GDBProcessesTest_7_11.class, LaunchConfigurationAndRestartTest_7_11.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/Suite_Remote_7_11.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/Suite_Remote_7_11.java index 9e49953a863..a1fe926dc2b 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/Suite_Remote_7_11.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_11/Suite_Remote_7_11.java @@ -11,6 +11,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -29,7 +31,7 @@ import org.junit.runners.Suite; // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBMultiNonStopRunControlTest_7_11.class, GDBRemoteTracepointsTest_7_11.class, - MIRegistersTest_7_11.class, + MIRegistersTest.class, MIRunControlTest_7_11.class, MIRunControlTargetAvailableTest_7_11.class, MIRunControlNonStopTargetAvailableTest_7_11.class, @@ -38,7 +40,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_11.class, MIMemoryTest_7_11.class, MIBreakpointsTest.class, - MICatchpointsTest_7_11.class, + MICatchpointsTest.class, MIDisassemblyTest_7_11.class, GDBProcessesTest_7_11.class, OperationsWhileTargetIsRunningTest_7_11.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MICatchpointsTest_7_2.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MICatchpointsTest_7_2.java deleted file mode 100644 index e8c01d3db98..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MICatchpointsTest_7_2.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_2; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_1.MICatchpointsTest_7_1; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_7_2 extends MICatchpointsTest_7_1 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_2); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MIRegistersTest_7_2.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MIRegistersTest_7_2.java deleted file mode 100644 index 19057036826..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MIRegistersTest_7_2.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2013 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson AB - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_2; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_1.MIRegistersTest_7_1; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_7_2 extends MIRegistersTest_7_1 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_2); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/Suite_7_2.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/Suite_7_2.java index 306774c2cff..f68d08224b1 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/Suite_7_2.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/Suite_7_2.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_2; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -32,7 +34,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_7_2.class, + MIRegistersTest.class, MIRunControlTest_7_2.class, MIRunControlTargetAvailableTest_7_2.class, MIRunControlNonStopTargetAvailableTest_7_2.class, @@ -41,7 +43,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_2.class, MIMemoryTest_7_2.class, MIBreakpointsTest.class, - MICatchpointsTest_7_2.class, + MICatchpointsTest.class, MIDisassemblyTest_7_2.class, GDBProcessesTest_7_2.class, LaunchConfigurationAndRestartTest_7_2.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/Suite_Remote_7_2.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/Suite_Remote_7_2.java index 4418754e577..62c57416dc5 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/Suite_Remote_7_2.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/Suite_Remote_7_2.java @@ -17,6 +17,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -34,7 +36,7 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBRemoteTracepointsTest_7_2.class, - MIRegistersTest_7_2.class, + MIRegistersTest.class, MIRunControlTest_7_2.class, MIRunControlTargetAvailableTest_7_2.class, MIRunControlNonStopTargetAvailableTest_7_2.class, @@ -43,7 +45,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_2.class, MIMemoryTest_7_2.class, MIBreakpointsTest.class, - MICatchpointsTest_7_2.class, + MICatchpointsTest.class, MIDisassemblyTest_7_2.class, GDBProcessesTest_7_2.class, OperationsWhileTargetIsRunningTest_7_2.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/MICatchpointsTest_7_3.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/MICatchpointsTest_7_3.java deleted file mode 100644 index d5a11d4a803..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/MICatchpointsTest_7_3.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_3; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_2.MICatchpointsTest_7_2; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_7_3 extends MICatchpointsTest_7_2 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_3); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/MIRegistersTest_7_3.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/MIRegistersTest_7_3.java deleted file mode 100644 index 300a0486bab..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/MIRegistersTest_7_3.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson AB - Initial Implementation - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_3; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_2.MIRegistersTest_7_2; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_7_3 extends MIRegistersTest_7_2 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_3); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/Suite_7_3.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/Suite_7_3.java index 81779de4020..3ece06eff21 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/Suite_7_3.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/Suite_7_3.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_3; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -32,7 +34,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_7_3.class, + MIRegistersTest.class, MIRunControlTest_7_3.class, MIRunControlTargetAvailableTest_7_3.class, MIRunControlNonStopTargetAvailableTest_7_3.class, @@ -41,7 +43,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_3.class, MIMemoryTest_7_3.class, MIBreakpointsTest.class, - MICatchpointsTest_7_3.class, + MICatchpointsTest.class, MIDisassemblyTest_7_3.class, GDBProcessesTest_7_3.class, LaunchConfigurationAndRestartTest_7_3.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/Suite_Remote_7_3.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/Suite_Remote_7_3.java index bb09c6291d0..e34e2cbc935 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/Suite_Remote_7_3.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/Suite_Remote_7_3.java @@ -17,6 +17,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -34,7 +36,7 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBRemoteTracepointsTest_7_3.class, - MIRegistersTest_7_3.class, + MIRegistersTest.class, MIRunControlTest_7_3.class, MIRunControlTargetAvailableTest_7_3.class, MIRunControlNonStopTargetAvailableTest_7_3.class, @@ -43,7 +45,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_3.class, MIMemoryTest_7_3.class, MIBreakpointsTest.class, - MICatchpointsTest_7_3.class, + MICatchpointsTest.class, MIDisassemblyTest_7_3.class, GDBProcessesTest_7_3.class, OperationsWhileTargetIsRunningTest_7_3.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/MICatchpointsTest_7_4.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/MICatchpointsTest_7_4.java deleted file mode 100644 index 39b21b83750..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/MICatchpointsTest_7_4.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_4; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_3.MICatchpointsTest_7_3; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_7_4 extends MICatchpointsTest_7_3 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_4); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/MIRegistersTest_7_4.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/MIRegistersTest_7_4.java deleted file mode 100644 index ec41d09e4a4..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/MIRegistersTest_7_4.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_4; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_3.MIRegistersTest_7_3; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_7_4 extends MIRegistersTest_7_3 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_4); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/StepIntoSelectionTest_7_4.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/StepIntoSelectionTest_7_4.java index 36101cad39b..69a475bed20 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/StepIntoSelectionTest_7_4.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/StepIntoSelectionTest_7_4.java @@ -14,8 +14,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_4; import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_3.StepIntoSelectionTest_7_3; -import org.junit.runner.RunWith; import org.junit.Test; +import org.junit.runner.RunWith; @RunWith(BackgroundRunner.class) public class StepIntoSelectionTest_7_4 extends StepIntoSelectionTest_7_3 { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/Suite_7_4.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/Suite_7_4.java index 509a80b5196..34dafe6abd6 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/Suite_7_4.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/Suite_7_4.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_4; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -32,7 +34,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_7_4.class, + MIRegistersTest.class, MIRunControlTest_7_4.class, MIRunControlTargetAvailableTest_7_4.class, MIRunControlNonStopTargetAvailableTest_7_4.class, @@ -41,7 +43,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_4.class, MIMemoryTest_7_4.class, MIBreakpointsTest.class, - MICatchpointsTest_7_4.class, + MICatchpointsTest.class, MIDisassemblyTest_7_4.class, GDBProcessesTest_7_4.class, LaunchConfigurationAndRestartTest_7_4.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/Suite_Remote_7_4.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/Suite_Remote_7_4.java index 66f009f9324..f8004e349a6 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/Suite_Remote_7_4.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_4/Suite_Remote_7_4.java @@ -17,6 +17,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -34,7 +36,7 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBRemoteTracepointsTest_7_4.class, - MIRegistersTest_7_4.class, + MIRegistersTest.class, MIRunControlTest_7_4.class, MIRunControlTargetAvailableTest_7_4.class, MIRunControlNonStopTargetAvailableTest_7_4.class, @@ -43,7 +45,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_4.class, MIMemoryTest_7_4.class, MIBreakpointsTest.class, - MICatchpointsTest_7_4.class, + MICatchpointsTest.class, MIDisassemblyTest_7_4.class, GDBProcessesTest_7_4.class, OperationsWhileTargetIsRunningTest_7_4.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/MICatchpointsTest_7_5.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/MICatchpointsTest_7_5.java deleted file mode 100644 index 1d550ec4716..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/MICatchpointsTest_7_5.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_5; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_4.MICatchpointsTest_7_4; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_7_5 extends MICatchpointsTest_7_4 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_5); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/MIRegistersTest_7_5.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/MIRegistersTest_7_5.java deleted file mode 100644 index f173afe531f..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/MIRegistersTest_7_5.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_5; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_4.MIRegistersTest_7_4; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_7_5 extends MIRegistersTest_7_4 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_5); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/Suite_7_5.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/Suite_7_5.java index 38b673c218a..a3eabdc3ded 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/Suite_7_5.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/Suite_7_5.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_5; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -33,7 +35,7 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBMultiNonStopRunControlTest_7_5.class, - MIRegistersTest_7_5.class, + MIRegistersTest.class, MIRunControlTest_7_5.class, MIRunControlTargetAvailableTest_7_5.class, MIRunControlNonStopTargetAvailableTest_7_5.class, @@ -42,7 +44,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_5.class, MIMemoryTest_7_5.class, MIBreakpointsTest.class, - MICatchpointsTest_7_5.class, + MICatchpointsTest.class, MIDisassemblyTest_7_5.class, GDBProcessesTest_7_5.class, LaunchConfigurationAndRestartTest_7_5.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/Suite_Remote_7_5.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/Suite_Remote_7_5.java index e1ce89eb559..d3c33d8f907 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/Suite_Remote_7_5.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/Suite_Remote_7_5.java @@ -17,6 +17,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -34,7 +36,7 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBRemoteTracepointsTest_7_5.class, - MIRegistersTest_7_5.class, + MIRegistersTest.class, MIRunControlTest_7_5.class, MIRunControlTargetAvailableTest_7_5.class, MIRunControlNonStopTargetAvailableTest_7_5.class, @@ -43,7 +45,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_5.class, MIMemoryTest_7_5.class, MIBreakpointsTest.class, - MICatchpointsTest_7_5.class, + MICatchpointsTest.class, MIDisassemblyTest_7_5.class, GDBProcessesTest_7_5.class, OperationsWhileTargetIsRunningTest_7_5.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/MICatchpointsTest_7_6.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/MICatchpointsTest_7_6.java deleted file mode 100644 index 560d6365d01..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/MICatchpointsTest_7_6.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012, 2013 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_6; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_5.MICatchpointsTest_7_5; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_7_6 extends MICatchpointsTest_7_5 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_6); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/MIRegistersTest_7_6.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/MIRegistersTest_7_6.java deleted file mode 100644 index 5a265c77065..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/MIRegistersTest_7_6.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012, 2013 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_6; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_5.MIRegistersTest_7_5; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_7_6 extends MIRegistersTest_7_5 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_6); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/Suite_7_6.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/Suite_7_6.java index b29bb881edb..cd654bb79e1 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/Suite_7_6.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/Suite_7_6.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_6; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -32,7 +34,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_7_6.class, + MIRegistersTest.class, MIRunControlTest_7_6.class, MIRunControlTargetAvailableTest_7_6.class, MIRunControlNonStopTargetAvailableTest_7_6.class, @@ -41,7 +43,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_6.class, MIMemoryTest_7_6.class, MIBreakpointsTest.class, - MICatchpointsTest_7_6.class, + MICatchpointsTest.class, MIDisassemblyTest_7_6.class, GDBProcessesTest_7_6.class, LaunchConfigurationAndRestartTest_7_6.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/Suite_Remote_7_6.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/Suite_Remote_7_6.java index 1c71491c9c9..e3b669a0a1c 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/Suite_Remote_7_6.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/Suite_Remote_7_6.java @@ -17,6 +17,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -35,7 +37,7 @@ import org.junit.runners.Suite; // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBMultiNonStopRunControlTest_7_6.class, GDBRemoteTracepointsTest_7_6.class, - MIRegistersTest_7_6.class, + MIRegistersTest.class, MIRunControlTest_7_6.class, MIRunControlTargetAvailableTest_7_6.class, MIRunControlNonStopTargetAvailableTest_7_6.class, @@ -44,7 +46,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_6.class, MIMemoryTest_7_6.class, MIBreakpointsTest.class, - MICatchpointsTest_7_6.class, + MICatchpointsTest.class, MIDisassemblyTest_7_6.class, GDBProcessesTest_7_6.class, OperationsWhileTargetIsRunningTest_7_6.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/MICatchpointsTest_7_7.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/MICatchpointsTest_7_7.java deleted file mode 100644 index f406e02d11b..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/MICatchpointsTest_7_7.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_7; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_6.MICatchpointsTest_7_6; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_7_7 extends MICatchpointsTest_7_6 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_7); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/MIRegistersTest_7_7.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/MIRegistersTest_7_7.java deleted file mode 100644 index b70847e20c9..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/MIRegistersTest_7_7.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_7; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_6.MIRegistersTest_7_6; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_7_7 extends MIRegistersTest_7_6 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_7); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/Suite_7_7.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/Suite_7_7.java index 5c9d5fb1fe4..80d925ff47e 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/Suite_7_7.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/Suite_7_7.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_7; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -32,7 +34,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_7_7.class, + MIRegistersTest.class, MIRunControlTest_7_7.class, MIRunControlTargetAvailableTest_7_7.class, MIRunControlNonStopTargetAvailableTest_7_7.class, @@ -41,7 +43,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_7.class, MIMemoryTest_7_7.class, MIBreakpointsTest.class, - MICatchpointsTest_7_7.class, + MICatchpointsTest.class, MIDisassemblyTest_7_7.class, GDBProcessesTest_7_7.class, LaunchConfigurationAndRestartTest_7_7.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/Suite_Remote_7_7.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/Suite_Remote_7_7.java index 2a40eb1c890..65f1dcba98a 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/Suite_Remote_7_7.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_7/Suite_Remote_7_7.java @@ -17,6 +17,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -35,7 +37,7 @@ import org.junit.runners.Suite; // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBMultiNonStopRunControlTest_7_7.class, GDBRemoteTracepointsTest_7_7.class, - MIRegistersTest_7_7.class, + MIRegistersTest.class, MIRunControlTest_7_7.class, MIRunControlTargetAvailableTest_7_7.class, MIRunControlNonStopTargetAvailableTest_7_7.class, @@ -44,7 +46,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_7.class, MIMemoryTest_7_7.class, MIBreakpointsTest.class, - MICatchpointsTest_7_7.class, + MICatchpointsTest.class, MIDisassemblyTest_7_7.class, GDBProcessesTest_7_7.class, OperationsWhileTargetIsRunningTest_7_7.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/MICatchpointsTest_7_8.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/MICatchpointsTest_7_8.java deleted file mode 100644 index 027f75b8629..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/MICatchpointsTest_7_8.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_8; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_7.MICatchpointsTest_7_7; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_7_8 extends MICatchpointsTest_7_7 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_8); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/MIRegistersTest_7_8.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/MIRegistersTest_7_8.java deleted file mode 100644 index d9b3301821f..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/MIRegistersTest_7_8.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_8; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_7.MIRegistersTest_7_7; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_7_8 extends MIRegistersTest_7_7 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_8); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/Suite_7_8.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/Suite_7_8.java index b1aa52903a5..3ee3db8c47f 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/Suite_7_8.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/Suite_7_8.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_8; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -32,7 +34,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_7_8.class, + MIRegistersTest.class, MIRunControlTest_7_8.class, MIRunControlTargetAvailableTest_7_8.class, MIRunControlNonStopTargetAvailableTest_7_8.class, @@ -41,7 +43,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_8.class, MIMemoryTest_7_8.class, MIBreakpointsTest.class, - MICatchpointsTest_7_8.class, + MICatchpointsTest.class, MIDisassemblyTest_7_8.class, GDBProcessesTest_7_8.class, LaunchConfigurationAndRestartTest_7_8.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/Suite_Remote_7_8.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/Suite_Remote_7_8.java index 5635efb71d1..85d042a39be 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/Suite_Remote_7_8.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_8/Suite_Remote_7_8.java @@ -17,6 +17,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -35,7 +37,7 @@ import org.junit.runners.Suite; // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBMultiNonStopRunControlTest_7_8.class, GDBRemoteTracepointsTest_7_8.class, - MIRegistersTest_7_8.class, + MIRegistersTest.class, MIRunControlTest_7_8.class, MIRunControlTargetAvailableTest_7_8.class, MIRunControlNonStopTargetAvailableTest_7_8.class, @@ -44,7 +46,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_8.class, MIMemoryTest_7_8.class, MIBreakpointsTest.class, - MICatchpointsTest_7_8.class, + MICatchpointsTest.class, MIDisassemblyTest_7_8.class, GDBProcessesTest_7_8.class, OperationsWhileTargetIsRunningTest_7_8.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/MICatchpointsTest_7_9.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/MICatchpointsTest_7_9.java deleted file mode 100644 index cb9f21859f8..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/MICatchpointsTest_7_9.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_9; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_8.MICatchpointsTest_7_8; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MICatchpointsTest_7_9 extends MICatchpointsTest_7_8 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_9); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/MIRegistersTest_7_9.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/MIRegistersTest_7_9.java deleted file mode 100644 index 93df21b5b65..00000000000 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/MIRegistersTest_7_9.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Ericsson 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Marc Khouzam (Ericsson) - Initial implementation of Test cases - *******************************************************************************/ -package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_9; - -import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner; -import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; -import org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_8.MIRegistersTest_7_8; -import org.junit.runner.RunWith; - -@RunWith(BackgroundRunner.class) -public class MIRegistersTest_7_9 extends MIRegistersTest_7_8 { - @Override - protected void setGdbVersion() { - setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_9); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/Suite_7_9.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/Suite_7_9.java index 3034f4108aa..396c273337f 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/Suite_7_9.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/Suite_7_9.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_9; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -31,7 +33,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 - MIRegistersTest_7_9.class, + MIRegistersTest.class, MIRunControlTest_7_9.class, MIRunControlTargetAvailableTest_7_9.class, MIRunControlNonStopTargetAvailableTest_7_9.class, @@ -40,7 +42,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_9.class, MIMemoryTest_7_9.class, MIBreakpointsTest.class, - MICatchpointsTest_7_9.class, + MICatchpointsTest.class, MIDisassemblyTest_7_9.class, GDBProcessesTest_7_9.class, LaunchConfigurationAndRestartTest_7_9.class, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/Suite_Remote_7_9.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/Suite_Remote_7_9.java index 96e08f1c0dd..d79df64e4ab 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/Suite_Remote_7_9.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_9/Suite_Remote_7_9.java @@ -16,6 +16,8 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseRemoteSuite; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants; import org.eclipse.cdt.tests.dsf.gdb.tests.MIBreakpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MICatchpointsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -34,7 +36,7 @@ import org.junit.runners.Suite; // We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256 GDBMultiNonStopRunControlTest_7_9.class, GDBRemoteTracepointsTest_7_9.class, - MIRegistersTest_7_9.class, + MIRegistersTest.class, MIRunControlTest_7_9.class, MIRunControlTargetAvailableTest_7_9.class, MIRunControlNonStopTargetAvailableTest_7_9.class, @@ -43,7 +45,7 @@ import org.junit.runners.Suite; GDBPatternMatchingExpressionsTest_7_9.class, MIMemoryTest_7_9.class, MIBreakpointsTest.class, - MICatchpointsTest_7_9.class, + MICatchpointsTest.class, MIDisassemblyTest_7_9.class, GDBProcessesTest_7_9.class, OperationsWhileTargetIsRunningTest_7_9.class,