rpms/eclipse
7
0
Fork 0
Code Issues Pull Requests Releases Activity
e6112c26c7
eclipse/eclipse-fix-tests.patch
DistroBaker e6112c26c7 Merged update from upstream sources 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/eclipse.git#c21212b002b4e7a2ff68dde825f2e885df0dd979
2021-01-19 00:06:31 +00:00

281 lines
12 KiB
Diff
Raw Blame History

--- eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/MinimalTargetDefinitionPersistenceTests.java.orig 2016-04-19 20:07:36.947017206 +0100
+++ eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/MinimalTargetDefinitionPersistenceTests.java 2016-04-19 20:09:59.166077383 +0100
@@ -80,7 +80,7 @@
*/
protected IPath getJdtFeatureLocation() {
IPath path = new Path(TargetPlatform.getDefaultLocation());
- path = path.append("features");
+ path = path.append("droplets").append("eclipse-jdt").append("features");
File dir = path.toFile();
assertTrue("Missing features directory", dir.exists() && !dir.isFile());
String[] files = dir.list();
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
index f1f38f0..f9111e6 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
@@ -246,7 +246,7 @@
if (parent != null) {
File[] children = parent.listFiles((FileFilter) pathname -> {
String name = pathname.getName();
- return name.startsWith("eclipse-platform-");
+ return name.startsWith("eclipse-SDK-");
});
if (children != null && children.length == 1)
file = children[0];
diff --git eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
index 376daa6..1742a8d 100644
--- eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
+++ eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
@@ -17,6 +17,7 @@ bin.includes = .,\
resources/,\
lib/
src.includes = about.html
-jars.compile.order = .
+jars.compile.order = .,\
+ lib/annotations.jar
source.. = src/
-output.. = bin/
+source.lib/annotations.jar = src/
diff --git eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
index f34ae40..0f9877d 100644
--- eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
+++ eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
@@ -24,4 +24,6 @@ bin.includes = plugin.xml,\
plugin.properties
src.includes = about.html
src.excludes = src-resources/
-jars.compile.order = aptext.jar,apt.jar,.
+jars.compile.order = aptext.jar,apt.jar,.,\
+ resources/question.jar
+source.resources/question.jar = src-resources/
diff --git eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
index bc8963d..fbe4da3 100644
--- eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
+++ eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
@@ -28,3 +28,6 @@
src.includes = about.html
compilerArg=-proc:none
jars.extra.classpath = lib/javax15api.jar
+source.lib/apttestprocessors.jar = processors/
+jars.compile.order = lib/apttestprocessors.jar,\
+ .
--- eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties.orig 2016-03-24 14:25:47.076289150 +0000
+++ eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties 2016-03-24 14:26:39.528660802 +0000
@@ -28,6 +28,8 @@
Ant Tests/
source.lib/antUITestsSupport.jar = test support/
-jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar
+source.testbuildfiles/antUITestsSupport.jar = test support/
+jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar,testbuildfiles/antUITestsSupport.jar
output.lib/antUITestsSupport.jar = test_support_bin/
+output.testbuildfiles/antUITestsSupport.jar = test_support_bin/
output.anttestsui.jar = bin/
--- eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties.orig 2016-03-25 15:09:40.557786910 +0000
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties 2016-03-25 15:12:08.476059326 +0000
@@ -25,3 +25,5 @@
leaks/,\
performance/
javacWarnings..=-raw,-unchecked
+source.testresources/nls.jar = nls/
+jars.compile.order = .,testresources/nls.jar
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Client.java 2004-11-12 14:37:36.000000000 +0000
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package pkg;
+
+public class Client {
+
+ public String s;
+
+ {
+ s= Messages.getString("test");
+ s= Messages.getString("test_undefined");
+ s= Messages.getString("duplicate");
+ s= Messages.getString("test.long.key");
+ s= Messages.getString("SearchResultView.removed_resource");
+ }
+
+}
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.java 2004-11-12 14:37:28.000000000 +0000
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package pkg;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages extends Object {
+ private static final String RESOURCE_BUNDLE = Messages.class.getName();
+ private static ResourceBundle fgResourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);
+
+ private Messages() {}
+
+ /**
+ * Gets a string from the resource bundle and formats it with the argument
+ *
+ * @param key the string used to get the bundle value, must not be null
+ */
+ public static String getFormattedString(String key, Object arg) {
+ String format = null;
+
+ try {
+ format = fgResourceBundle.getString(key);
+ } catch (MissingResourceException e) {
+ return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$
+ }
+
+ if (arg == null) {
+ arg = ""; //$NON-NLS-1$
+ }
+
+ return MessageFormat.format(format, new Object[] { arg });
+ }
+
+ /**
+ * Gets a string from the resource bundle and formats it with arguments
+ */
+ public static String getFormattedString(String key, String[] args) {
+ return MessageFormat.format(fgResourceBundle.getString(key), args);
+ }
+
+ public static String getString(String key) {
+ try {
+ return fgResourceBundle.getString(key);
+ } catch (MissingResourceException e) {
+ return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$
+ }
+ }
+}
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.properties 2004-11-12 14:38:06.000000000 +0000
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2000, 2004 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Common Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/cpl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+test= Hello World
+duplicate= Duplicate 1
+test.long.key= Hello World Long
+duplicate= Duplicate 2
+SearchResultView.removed_resource= <removed resource>
--- eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties.orig 2017-03-03 14:20:53.868573338 +0000
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties 2017-03-06 14:26:42.382365639 +0000
@@ -26,6 +26,8 @@
source.anttestscore.jar = test plugin/,\
tests/
source.lib/antTestsSupport.jar = test support/
-jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar
+source.testlib/classpathOrdering1.jar = testlib_src/classpathOrdering1/
+source.testlib/classpathOrdering2.jar = testlib_src/classpathOrdering2/
+jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar,testlib/classpathOrdering1.jar,testlib/classpathOrdering2.jar
output.lib/antTestsSupport.jar = test_support_bin/
output.anttestscore.jar = bin/
--- /dev/null 2017-02-12 18:27:14.283389371 +0000
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering1/ClasspathOrdering.java 2017-03-06 14:28:57.742879825 +0000
@@ -0,0 +1,10 @@
+import java.io.PrintStream;
+
+public class ClasspathOrdering
+{
+ public static void main(String[] args)
+ {
+ System.out.println("classpathOrdering1");
+ }
+}
+
--- /dev/null 2017-02-12 18:27:14.283389371 +0000
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering2/ClasspathOrdering.java 2017-03-06 14:29:45.759352762 +0000
@@ -0,0 +1,10 @@
+import java.io.PrintStream;
+
+public class ClasspathOrdering
+{
+ public static void main(String[] args)
+ {
+ System.out.println("classpathOrdering2");
+ }
+}
+
--- eclipse.pde.build/org.eclipse.pde.build.tests/test.xml.orig 2017-04-28 11:49:47.046123546 +0100
+++ eclipse.pde.build/org.eclipse.pde.build.tests/test.xml 2017-04-28 12:05:11.947521737 +0100
@@ -159,13 +159,6 @@
id="org.eclipse.jdt.source.feature.group"
version="" />
<iu
- id="org.eclipse.rcp.configuration.feature.group"
- version="" />
-
- <iu
- id="org.eclipse.equinox.executable"
- version="" />
- <iu
id="org.eclipse.e4.rcp.feature.group"
version="" />
<iu
--- eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml.orig 2019-03-11 12:52:52.879124384 +0000
+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml 2019-03-11 12:54:16.445849939 +0000
@@ -39,7 +39,22 @@
</includes>
<argLine>${tycho.surefire.argLine}</argLine>
</configuration>
- </plugin>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jdt.annotation</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
</plugins>
</build>
--- eclipse.jdt.debug/org.eclipse.jdt.debug.ui/build.properties.orig 2019-12-19 05:19:24.194321737 +0000
+++ eclipse.jdt.debug/org.eclipse.jdt.debug.ui/build.properties 2019-12-19 05:20:03.702264652 +0000
@@ -21,6 +21,9 @@
src.includes = about.html,\
schema/
+source.snippetsupport.jar=Snippet Support/
source.. = ui/
output.. = bin/
+output.snippetsupport.jar = snippet_bin/
javacWarnings..=-unavoidableGenericProblems
+javacWarnings.snippersupport.jar=-unavoidableGenericProblems
Reference in New Issue View Git Blame Copy Permalink