|
 |
bff49ec |
diff --git eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java
|
|
|
bff49ec |
index 945bafa..21dbc62 100644
|
|
|
bff49ec |
--- eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java
|
|
|
bff49ec |
+++ eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java
|
|
|
bff49ec |
@@ -73,7 +73,7 @@ public class TargetDefinitionPersistenceTests extends TestCase {
|
|
|
bff49ec |
*/
|
|
|
bff49ec |
protected IPath getJdtFeatureLocation() {
|
|
|
bff49ec |
IPath path = new Path(TargetPlatform.getDefaultLocation());
|
|
|
bff49ec |
- path = path.append("features");
|
|
|
bff49ec |
+ path = path.append("dropins").append("jdt").append("features");
|
|
|
bff49ec |
File dir = path.toFile();
|
|
|
bff49ec |
assertTrue("Missing features directory", dir.exists() && !dir.isFile());
|
|
|
bff49ec |
String[] files = dir.list();
|
|
|
bff49ec |
@@ -668,4 +668,4 @@ public class TargetDefinitionPersistenceTests extends TestCase {
|
|
|
bff49ec |
assertTrue(iubc.getIncludeSource());
|
|
|
bff49ec |
}
|
|
|
bff49ec |
|
|
|
bff49ec |
-}
|
|
|
bff49ec |
\ No newline at end of file
|
|
|
bff49ec |
+}
|
|
|
bff49ec |
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
|
|
|
bff49ec |
index f1f38f0..f9111e6 100644
|
|
|
bff49ec |
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
|
|
|
bff49ec |
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
|
|
|
bff49ec |
@@ -217,7 +217,7 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest {
|
|
|
bff49ec |
File[] children = parent.listFiles(new FileFilter() {
|
|
|
bff49ec |
public boolean accept(File pathname) {
|
|
|
bff49ec |
String name = pathname.getName();
|
|
|
bff49ec |
- return name.startsWith("eclipse-platform-");
|
|
|
bff49ec |
+ return name.startsWith("eclipse-SDK-");
|
|
|
bff49ec |
}
|
|
|
bff49ec |
});
|
|
|
bff49ec |
if (children != null && children.length == 1)
|
|
 |
8fcf627 |
diff --git eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
|
|
|
8fcf627 |
index 0245d89..e95ff8f 100644
|
|
|
8fcf627 |
--- eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
|
|
|
8fcf627 |
+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
|
|
|
8fcf627 |
@@ -4416,6 +4416,10 @@ public void test434297() {
|
|
|
8fcf627 |
public void test436542() throws Exception {
|
|
|
8fcf627 |
String jreDirectory = Util.getJREDirectory();
|
|
|
8fcf627 |
String jfxJar = Util.toNativePath(jreDirectory + "/lib/ext/jfxrt.jar");
|
|
|
8fcf627 |
+ File file = new File(jfxJar);
|
|
|
8fcf627 |
+ if (!file.exists()) {
|
|
|
8fcf627 |
+ return;
|
|
|
8fcf627 |
+ }
|
|
|
8fcf627 |
this.runConformTest(
|
|
|
8fcf627 |
new String[] {
|
|
|
8fcf627 |
"Utility.java",
|
|
|
8fcf627 |
diff --git eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
|
|
|
8fcf627 |
index 1a0cbcc..ddad62f 100644
|
|
|
8fcf627 |
--- eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
|
|
|
8fcf627 |
+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
|
|
|
8fcf627 |
@@ -6781,6 +6781,10 @@ public void testBug434582a() {
|
|
|
8fcf627 |
public void test443467() throws Exception {
|
|
|
8fcf627 |
String jreDirectory = Util.getJREDirectory();
|
|
|
8fcf627 |
String jfxJar = Util.toNativePath(jreDirectory + "/lib/ext/jfxrt.jar");
|
|
|
8fcf627 |
+ File file = new File(jfxJar);
|
|
|
8fcf627 |
+ if (!file.exists()) {
|
|
|
8fcf627 |
+ return;
|
|
|
8fcf627 |
+ }
|
|
|
8fcf627 |
this.runNegativeTestWithExtraLibs(
|
|
|
8fcf627 |
new String[] {
|
|
|
8fcf627 |
"BuildIdeMain.java",
|
|
|
8fcf627 |
diff --git eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
|
|
|
8fcf627 |
index 376daa6..1742a8d 100644
|
|
|
8fcf627 |
--- eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
|
|
|
8fcf627 |
+++ eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
|
|
|
8fcf627 |
@@ -14,6 +14,7 @@ bin.includes = .,\
|
|
|
8fcf627 |
resources/,\
|
|
|
8fcf627 |
lib/
|
|
|
8fcf627 |
src.includes = about.html
|
|
|
8fcf627 |
-jars.compile.order = .
|
|
|
8fcf627 |
+jars.compile.order = .,\
|
|
|
8fcf627 |
+ lib/annotations.jar
|
|
|
8fcf627 |
source.. = src/
|
|
|
8fcf627 |
-output.. = bin/
|
|
|
8fcf627 |
+source.lib/annotations.jar = src/
|
|
|
8fcf627 |
diff --git eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
|
|
|
8fcf627 |
index f34ae40..0f9877d 100644
|
|
|
8fcf627 |
--- eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
|
|
|
8fcf627 |
+++ eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
|
|
|
8fcf627 |
@@ -21,4 +21,6 @@ bin.includes = plugin.xml,\
|
|
|
8fcf627 |
plugin.properties
|
|
|
8fcf627 |
src.includes = about.html
|
|
|
8fcf627 |
src.excludes = src-resources/
|
|
|
8fcf627 |
-jars.compile.order = aptext.jar,apt.jar,.
|
|
|
8fcf627 |
+jars.compile.order = aptext.jar,apt.jar,.,\
|
|
|
8fcf627 |
+ resources/question.jar
|
|
|
8fcf627 |
+source.resources/question.jar = src-resources/
|
|
|
8fcf627 |
diff --git eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
|
|
|
8fcf627 |
index bc8963d..fbe4da3 100644
|
|
|
8fcf627 |
--- eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
|
|
|
8fcf627 |
+++ eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
|
|
|
8fcf627 |
@@ -10,11 +10,6 @@
|
|
|
8fcf627 |
# Red Hat Inc. (mistria) - Avoid nested jars
|
|
|
8fcf627 |
###############################################################################
|
|
|
8fcf627 |
source.. = src/
|
|
|
8fcf627 |
-output.. = bin/
|
|
|
8fcf627 |
-# Don't rebuild apttestprocessors everytime to avoid dirty working tree
|
|
|
8fcf627 |
-# lib/apttestprocessors.jar considered as a resource set a dev-timeY
|
|
|
8fcf627 |
-#source.lib/apttestprocessors.jar = processors/
|
|
|
8fcf627 |
-#jars.compile.order = lib/apttestprocessors.jar,.
|
|
|
8fcf627 |
bin.includes = about.html,\
|
|
|
8fcf627 |
plugin.properties,\
|
|
|
8fcf627 |
test.xml,\
|
|
|
8fcf627 |
@@ -24,3 +19,9 @@ bin.includes = about.html,\
|
|
|
8fcf627 |
.
|
|
|
8fcf627 |
src.includes = about.html
|
|
|
8fcf627 |
compilerArg=-proc:none
|
|
|
8fcf627 |
+source.lib/apttestprocessors.jar = processors/
|
|
|
8fcf627 |
+source.lib/apttestprocessors8.jar = processors/,\
|
|
|
8fcf627 |
+ processors8/
|
|
|
8fcf627 |
+jars.compile.order = lib/apttestprocessors.jar,\
|
|
|
8fcf627 |
+ lib/apttestprocessors8.jar,\
|
|
|
8fcf627 |
+ .
|