From a19bbeb962e7005276412e628a77dc7d2f40be49 Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Fri, 24 Apr 2015 13:48:30 -0400
Subject: [PATCH] Bug 464636 - Modernize TestsRunner Run launch

The TestsRunner Run launch automatically inherits the Run launch from
CDT but specifies the tabs itself.  Now that we modernized the CDT Run
launch and use CMainTab2, we should do the same for TestsRunner.

Also, remove the source tab for the TestsRunner Run launch; that tab is
only for debugging.

Change-Id: I4d412787f4e937ae776f01470f4c63746589ef75
Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com>
---
 .../org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF |  2 +-
 testsrunner/org.eclipse.cdt.testsrunner/plugin.xml   | 12 ++----------
 testsrunner/org.eclipse.cdt.testsrunner/pom.xml      |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF b/testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF
index b881657f6f0..072e503461c 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF
+++ b/testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.testsrunner;singleton:=true
-Bundle-Version: 7.0.0.qualifier
+Bundle-Version: 7.1.0.qualifier
 Bundle-Activator: org.eclipse.cdt.testsrunner.internal.TestsRunnerPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/testsrunner/org.eclipse.cdt.testsrunner/plugin.xml b/testsrunner/org.eclipse.cdt.testsrunner/plugin.xml
index 13d29059119..bdeb57af6db 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner/plugin.xml
+++ b/testsrunner/org.eclipse.cdt.testsrunner/plugin.xml
@@ -76,7 +76,7 @@
             id="org.eclipse.cdt.testsrunner.launch.mainTab"
             group="org.eclipse.cdt.testsrunner.launch.runTestsTabGroup"
             name="%MainLaunchTab.name"
-            class="org.eclipse.cdt.launch.ui.CMainTab">
+            class="org.eclipse.cdt.launch.ui.CMainTab2">
         <associatedDelegate delegate="org.eclipse.cdt.testsrunner.launch.runTests"/>
       </tab>
       <tab
@@ -103,21 +103,13 @@
         <associatedDelegate delegate="org.eclipse.cdt.testsrunner.launch.runTests"/>
         <placement after="org.eclipse.cdt.testsrunner.testingTab"/>
       </tab>
-      <tab
-            id="org.eclipse.cdt.testsrunner.launch.sourceLookupTab"
-            group="org.eclipse.cdt.testsrunner.launch.runTestsTabGroup"
-            name="%SourceLookupLaunchTab.name"
-            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
-        <associatedDelegate delegate="org.eclipse.cdt.testsrunner.launch.runTests"/>
-        <placement after="org.eclipse.cdt.cdi.launch.environmentTab"/>
-      </tab>
       <tab
             id="org.eclipse.cdt.testsrunner.launch.commonTab"
             group="org.eclipse.cdt.testsrunner.launch.runTestsTabGroup"
             name="%CommonLaunchTab.name"
             class="org.eclipse.debug.ui.CommonTab">
         <associatedDelegate delegate="org.eclipse.cdt.testsrunner.launch.runTests"/>
-        <placement after="org.eclipse.debug.ui.sourceLookupTab"/>
+        <placement after="org.eclipse.cdt.cdi.launch.environmentTab"/>
       </tab>
 
       <!-- Tests debug (CDI) tabs-->
diff --git a/testsrunner/org.eclipse.cdt.testsrunner/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner/pom.xml
index 6f00a066d30..da05c4af4d6 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner/pom.xml
+++ b/testsrunner/org.eclipse.cdt.testsrunner/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<version>7.0.0-SNAPSHOT</version>
+	<version>7.1.0-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.testsrunner</artifactId>
 	<packaging>eclipse-plugin</packaging>
 </project>