Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [cdt-patch] Few touches to make org.eclipse.cdt.core.tests build properly

Sebastien, you are the only one who can commit all of these patches (and 
the only one who can commit to the source-feature).

Thanks,
Doug Schaefer, Senior Software Developer
IBM Rational Software, Ottawa, Ontario, Canada



Vladimir Hirsl/Ottawa/Contr/IBM@IBMCA 
Sent by: cdt-patch-admin@xxxxxxxxxxx
06/20/2003 05:32 PM
Please respond to
cdt-patch@xxxxxxxxxxx


To
cdt-patch@xxxxxxxxxxx
cc

Subject
[cdt-patch] Few touches to make org.eclipse.cdt.core.tests build properly 






Index: feature.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt.testing-feature/feature.xml,v
retrieving revision 1.3
diff -u -r1.3 feature.xml
--- feature.xml	23 Apr 2003 18:15:56 -0000	1.3
+++ feature.xml	20 Jun 2003 21:25:44 -0000
@@ -23,7 +23,7 @@
 
    <requires>
       <import plugin="org.eclipse.platform" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt" version="1.0.1" match="equivalent"/>
+      <import plugin="org.eclipse.cdt" version="1.1.0" match="equivalent"/>
       <import plugin="org.eclipse.test" version="2.1.0" match="equivalent"/>
    </requires>
 
@@ -41,6 +41,12 @@
 
    <plugin
          id="org.eclipse.cdt.testing"
+         download-size="0"
+         install-size="0"
+         version="1.1.0"/>
+
+   <plugin
+         id="org.eclipse.cdt.core.tests"
          download-size="0"
          install-size="0"
          version="1.1.0"/>
Index: feature.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt.source-feature/feature.xml,v
retrieving revision 1.4
diff -u -r1.4 feature.xml
--- feature.xml	23 Apr 2003 18:15:39 -0000	1.4
+++ feature.xml	20 Jun 2003 21:27:05 -0000
@@ -112,4 +112,10 @@
          install-size="0"
          version="1.1.0"/>
 
+   <plugin
+         id="org.eclipse.cdt.core.tests"
+         download-size="0"
+         install-size="0"
+         version="1.1.0"/>
+
 </feature>
Index: .classpath
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/.classpath,v
retrieving revision 1.1
diff -u -r1.1 .classpath
--- .classpath	18 Jun 2003 21:29:47 -0000	1.1
+++ .classpath	20 Jun 2003 21:30:29 -0000
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="model"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+    <classpathentry kind="src" path="build/"/>
+    <classpathentry kind="src" path="failures/"/>
+    <classpathentry kind="src" path="model/"/>
+    <classpathentry kind="src" path="parser/"/>
+    <classpathentry kind="src" path="resources/"/>
+    <classpathentry kind="src" path="suite/"/>
+    <classpathentry kind="src" path="/org.apache.xerces"/>
     <classpathentry kind="src" path="/org.eclipse.core.resources"/>
     <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="suite"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="build"/>
-    <classpathentry kind="src" path="parser"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="failures"/>
+    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
+    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
+    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
+    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
+    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
     <classpathentry kind="src" path="/org.eclipse.swt"/>
     <classpathentry kind="src" path="/org.eclipse.ui"/>
+    <classpathentry kind="src" path="/org.junit"/>
+    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
Index: .project
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/.project,v
retrieving revision 1.2
diff -u -r1.2 .project
--- .project	20 Jun 2003 17:00:44 -0000	1.2
+++ .project	20 Jun 2003 21:30:29 -0000
@@ -9,6 +9,7 @@
 		<project>org.eclipse.cdt.core.qnx</project>
 		<project>org.eclipse.cdt.core.solaris</project>
 		<project>org.eclipse.cdt.core.win32</project>
+		<project>org.eclipse.cdt.ui</project>
 		<project>org.eclipse.core.boot</project>
 		<project>org.eclipse.core.resources</project>
 		<project>org.eclipse.core.runtime</project>
Index: build.properties
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/build.properties,v
retrieving revision 1.1
diff -u -r1.1 build.properties
--- build.properties	18 Jun 2003 21:29:47 -0000	1.1
+++ build.properties	20 Jun 2003 21:30:29 -0000
@@ -1,11 +1,3 @@
-source.cdtuitests.jar = src/,\
-                        ui/,\
-                        core/,\
-                        model/,\
-                        build/,\
-                        parser/,\
-                        failures/,\
-                        suite/
 bin.includes = plugin.xml,\
                about.html,\
                plugin.properties,\
@@ -17,3 +9,9 @@
                test.xml,\
                resources/
 about.html = 
+source.cdtcoretests.jar = build/,\
+                          failures/,\
+                          model/,\
+                          parser/,\
+                          resources/,\
+                          suite/
Index: plugin.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/plugin.xml,v
retrieving revision 1.1
diff -u -r1.1 plugin.xml
--- plugin.xml	18 Jun 2003 21:29:47 -0000	1.1
+++ plugin.xml	20 Jun 2003 21:30:29 -0000
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.core.tests"
    name="org.eclipse.cdt.core.tests"
-   version="1.2.0.5"
+   version="1.1.0"
    class="org.eclipse.cdt.testplugin.CTestPlugin">
 
    <runtime>
Index: test.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/test.xml,v
retrieving revision 1.1
diff -u -r1.1 test.xml
--- test.xml	18 Jun 2003 21:29:47 -0000	1.1
+++ test.xml	20 Jun 2003 21:30:29 -0000
@@ -30,11 +30,11 @@
     <property name="cdt-folder" 
               value="${eclipse-home}/cdt_folder"/>
     <delete dir="${cdt-folder}" quiet="true"/>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
+    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${cdt-folder}"/>
       <property name="plugin-name" value="${plugin-name}"/>
       <property name="classname" 
-                value="org.eclipse.cdt.core.model.tests.AllCoreTests"/>
+                value="org.eclipse.cdt.core.suite.AutomatedIntegrationSuite"/>
     </ant>
   </target>
 

Back to the top