From 7e5e7322244de1312c68edc5269009dee80f5309 Mon Sep 17 00:00:00 2001
From: Peter Graves <pgraves@qnx.com>
Date: Tue, 17 Dec 2002 15:42:17 +0000
Subject: [PATCH] Genreral cleanup (remove jdt refrences) and move closer to
 being automatable

---
 core/org.eclipse.cdt.ui.tests/ChangeLog         |  5 +++++
 core/org.eclipse.cdt.ui.tests/plugin.xml        |  8 ++++++--
 core/org.eclipse.cdt.ui.tests/test.xml          | 15 ++++++++-------
 debug/org.eclipse.cdt.debug.ui.tests/Changelog  |  5 +++++
 debug/org.eclipse.cdt.debug.ui.tests/plugin.xml |  8 ++++++--
 debug/org.eclipse.cdt.debug.ui.tests/test.xml   | 14 +++++++-------
 6 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/core/org.eclipse.cdt.ui.tests/ChangeLog b/core/org.eclipse.cdt.ui.tests/ChangeLog
index 45192ed792a..7a7df869070 100644
--- a/core/org.eclipse.cdt.ui.tests/ChangeLog
+++ b/core/org.eclipse.cdt.ui.tests/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-17 Peter Graves
+
+    * plugin.xml,test.xml: Some simple cleanups to remove refrences to the jdt and
+	to move closer to automated running
+    
 2002-11-27 Alain Magloire
 
 	* model/org/eclipse/cdt/core/model/tests/CModelTests.java:
diff --git a/core/org.eclipse.cdt.ui.tests/plugin.xml b/core/org.eclipse.cdt.ui.tests/plugin.xml
index 46d78414370..6e425318482 100644
--- a/core/org.eclipse.cdt.ui.tests/plugin.xml
+++ b/core/org.eclipse.cdt.ui.tests/plugin.xml
@@ -2,10 +2,13 @@
 <plugin
    id="org.eclipse.cdt.ui.tests"
    name="org.eclipse.cdt.ui.tests"
-   version="1.0.0">
+   version="1.0.0"
+   class="org.eclipse.cdt.testplugin.CTestPlugin">
 
    <runtime>
-      <library name="cdttests.jar"/>
+      <library name="cdttests.jar">
+         <export name="*"/>
+      </library>
    </runtime>
    <requires>
       <import plugin="org.apache.xerces"/>
@@ -17,6 +20,7 @@
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.junit"/>
+      <import plugin="org.eclipse.update.core"/>
    </requires>
 
 
diff --git a/core/org.eclipse.cdt.ui.tests/test.xml b/core/org.eclipse.cdt.ui.tests/test.xml
index 45036dab5c6..31b571cf8e5 100644
--- a/core/org.eclipse.cdt.ui.tests/test.xml
+++ b/core/org.eclipse.cdt.ui.tests/test.xml
@@ -3,10 +3,11 @@
 <project name="testsuite" default="run" basedir=".">
   <!-- The property ${eclipse-home} should be passed into this script -->
   <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
+<!--  <property name="eclipse-home" value="${basedir}\..\.."/> -->
+  <property name="eclipse-home" value="${basedir}"/>
 
   <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.jdt.ui.tests"/>
+  <property name="plugin-name" value="org.eclipse.cdt.ui.tests"/>
   <property name="library-file"
             value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
 
@@ -22,14 +23,14 @@
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
-    <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
-    <delete dir="${jdt-folder}" quiet="true"/>
+    <property name="cdt-folder" 
+              value="${eclipse-home}/cdt_folder"/>
+    <delete dir="${cdt-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-folder}"/>
+      <property name="data-dir" value="${cdt-folder}"/>
       <property name="plugin-name" value="${plugin-name}"/>
       <property name="classname" 
-                value="org.eclipse.jdt.ui.tests.AutomatedSuite"/>
+                value="org.eclipse.cdt.core.model.tests.AllCoreTests"/>
     </ant>
   </target>
 
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/Changelog b/debug/org.eclipse.cdt.debug.ui.tests/Changelog
index f8be61f7387..d40eefe6ae5 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/Changelog
+++ b/debug/org.eclipse.cdt.debug.ui.tests/Changelog
@@ -1,3 +1,8 @@
+2002-12-17 Peter Graves
+
+	* plugin.xml,test.xml:  Some simple cleanups to remove refrences to the jdt and
+	to move closer to automated running.
+	
 2002-10-30 Alain Magloire
 
 	* core/org/eclipse/cdt/debug/core/tests/TargetTests.java: Test number
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
index 3ca1e3de2f5..a535002a8f3 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
@@ -2,10 +2,13 @@
 <plugin
    id="org.eclipse.cdt.debug.ui.tests"
    name="org.eclipse.cdt.debug.ui.tests"
-   version="1.0.0">
+   version="1.0.0"
+   class="org.eclipse.cdt.debug.testplugin.CTestPlugin">
 
    <runtime>
-      <library name="cdtdebugtests.jar"/>
+      <library name="cdtdebugtests.jar">
+         <export name="*"/>
+      </library>
    </runtime>
    <requires>
       <import plugin="org.apache.xerces"/>
@@ -18,6 +21,7 @@
       <import plugin="org.eclipse.cdt.debug.mi.core"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.update.core"/>
    </requires>
 
 
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/test.xml b/debug/org.eclipse.cdt.debug.ui.tests/test.xml
index 45036dab5c6..41075b0e15e 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/test.xml
+++ b/debug/org.eclipse.cdt.debug.ui.tests/test.xml
@@ -3,10 +3,10 @@
 <project name="testsuite" default="run" basedir=".">
   <!-- The property ${eclipse-home} should be passed into this script -->
   <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
+  <property name="eclipse-home" value="${basedir}"/>
 
   <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.jdt.ui.tests"/>
+  <property name="plugin-name" value="org.eclipse.cdt.debug.ui.tests"/>
   <property name="library-file"
             value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
 
@@ -22,14 +22,14 @@
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
-    <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
-    <delete dir="${jdt-folder}" quiet="true"/>
+    <property name="cdt-folder" 
+              value="${eclipse-home}/cdt_folder"/>
+    <delete dir="${cdt-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-folder}"/>
+      <property name="data-dir" value="${cdt-folder}"/>
       <property name="plugin-name" value="${plugin-name}"/>
       <property name="classname" 
-                value="org.eclipse.jdt.ui.tests.AutomatedSuite"/>
+                value="org.eclipse.cdt.debug.core.tests.AllDebugTests"/>
     </ant>
   </target>