mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-06 15:55:47 +02:00
Merge in patch from Vladimir Hirsl
Also fixed a compile warning
This commit is contained in:
parent
b6cf841ca4
commit
506a17a722
6 changed files with 26 additions and 22 deletions
|
@ -1,18 +1,24 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" path="model"/>
|
<classpathentry kind="src" path="build/"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
<classpathentry kind="src" path="failures/"/>
|
||||||
<classpathentry kind="src" path="/org.junit"/>
|
<classpathentry kind="src" path="model/"/>
|
||||||
<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
|
<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.resources"/>
|
||||||
<classpathentry kind="src" path="/org.eclipse.core.runtime"/>
|
<classpathentry kind="src" path="/org.eclipse.core.runtime"/>
|
||||||
<classpathentry kind="src" path="suite"/>
|
<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
|
||||||
<classpathentry kind="src" path="/org.eclipse.core.boot"/>
|
<classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
|
||||||
<classpathentry kind="src" path="build"/>
|
<classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
|
||||||
<classpathentry kind="src" path="parser"/>
|
<classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
|
||||||
<classpathentry kind="src" path="/org.apache.xerces"/>
|
<classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
|
||||||
<classpathentry kind="src" path="failures"/>
|
<classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
|
||||||
<classpathentry kind="src" path="/org.eclipse.swt"/>
|
<classpathentry kind="src" path="/org.eclipse.swt"/>
|
||||||
<classpathentry kind="src" path="/org.eclipse.ui"/>
|
<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"/>
|
<classpathentry kind="output" path="bin"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
<project>org.eclipse.cdt.core.qnx</project>
|
<project>org.eclipse.cdt.core.qnx</project>
|
||||||
<project>org.eclipse.cdt.core.solaris</project>
|
<project>org.eclipse.cdt.core.solaris</project>
|
||||||
<project>org.eclipse.cdt.core.win32</project>
|
<project>org.eclipse.cdt.core.win32</project>
|
||||||
|
<project>org.eclipse.cdt.ui</project>
|
||||||
<project>org.eclipse.core.boot</project>
|
<project>org.eclipse.core.boot</project>
|
||||||
<project>org.eclipse.core.resources</project>
|
<project>org.eclipse.core.resources</project>
|
||||||
<project>org.eclipse.core.runtime</project>
|
<project>org.eclipse.core.runtime</project>
|
||||||
|
|
|
@ -1,11 +1,3 @@
|
||||||
source.cdtuitests.jar = src/,\
|
|
||||||
ui/,\
|
|
||||||
core/,\
|
|
||||||
model/,\
|
|
||||||
build/,\
|
|
||||||
parser/,\
|
|
||||||
failures/,\
|
|
||||||
suite/
|
|
||||||
bin.includes = plugin.xml,\
|
bin.includes = plugin.xml,\
|
||||||
about.html,\
|
about.html,\
|
||||||
plugin.properties,\
|
plugin.properties,\
|
||||||
|
@ -17,3 +9,9 @@ src.includes = plugin.xml,\
|
||||||
test.xml,\
|
test.xml,\
|
||||||
resources/
|
resources/
|
||||||
about.html =
|
about.html =
|
||||||
|
source.cdtcoretests.jar = build/,\
|
||||||
|
failures/,\
|
||||||
|
model/,\
|
||||||
|
parser/,\
|
||||||
|
resources/,\
|
||||||
|
suite/
|
||||||
|
|
|
@ -26,7 +26,6 @@ import org.eclipse.cdt.internal.core.parser.pst.IParameterizedSymbol;
|
||||||
import org.eclipse.cdt.internal.core.parser.pst.ISymbol;
|
import org.eclipse.cdt.internal.core.parser.pst.ISymbol;
|
||||||
import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable;
|
import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable;
|
||||||
import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTableException;
|
import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTableException;
|
||||||
import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable.Declaration;
|
|
||||||
import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable.Mark;
|
import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable.Mark;
|
||||||
import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable.TemplateInstance;
|
import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable.TemplateInstance;
|
||||||
import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable.TypeInfo;
|
import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable.TypeInfo;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.cdt.core.tests"
|
id="org.eclipse.cdt.core.tests"
|
||||||
name="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">
|
class="org.eclipse.cdt.testplugin.CTestPlugin">
|
||||||
|
|
||||||
<runtime>
|
<runtime>
|
||||||
|
|
|
@ -30,11 +30,11 @@
|
||||||
<property name="cdt-folder"
|
<property name="cdt-folder"
|
||||||
value="${eclipse-home}/cdt_folder"/>
|
value="${eclipse-home}/cdt_folder"/>
|
||||||
<delete dir="${cdt-folder}" quiet="true"/>
|
<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="data-dir" value="${cdt-folder}"/>
|
||||||
<property name="plugin-name" value="${plugin-name}"/>
|
<property name="plugin-name" value="${plugin-name}"/>
|
||||||
<property name="classname"
|
<property name="classname"
|
||||||
value="org.eclipse.cdt.core.model.tests.AllCoreTests"/>
|
value="org.eclipse.cdt.core.suite.AutomatedIntegrationSuite"/>
|
||||||
</ant>
|
</ant>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue