Bug 528899 - testDirectorLogging fails on all platforms
Revert the part removing lookup for deltapack as the test.xml file still
creates one. Totally bogus test IMHO.
Change-Id: I30d2935125203e088e2f50d780d6940838932264
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java
index 805ac19..a91a2e9 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java
@@ -344,6 +344,15 @@
}
}
}
+
+ if (Platform.OS_MACOSX.equals(Platform.getOS())) {
+ // After https://bugs.eclipse.org/431116 and related changes, the install
+ // location on the Mac
+ // moved down two directories (from <folder-containing-Eclipse.app> to
+ // Eclipse.app/Contents/Eclipse).
+ baseLocation = baseLocation.getParentFile().getParentFile();
+ }
+ executableLocation = findExecutable(new File(baseLocation.getParent(), "deltapack/eclipse"));
return executableLocation;
}
