Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2015-04-01 14:43:34 -0400
committerPascal Rapicault2015-04-01 14:43:34 -0400
commit494d45e1c376990e53f9a3e182c8189001ea6844 (patch)
tree5a575611e5f5b2f9a6692a3ee85368e7a7ddfc8d
parent36117913fe6fbd12f5031379bc9457303ea29ea0 (diff)
downloadrt.equinox.p2-494d45e1c376990e53f9a3e182c8189001ea6844.tar.gz
rt.equinox.p2-494d45e1c376990e53f9a3e182c8189001ea6844.tar.xz
rt.equinox.p2-494d45e1c376990e53f9a3e182c8189001ea6844.zip
Add missing classes to previous commit...
Maybe I should use gerrit...
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AbstractSharedInstallTest.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
index 3bb88d3b5..f1f38f070 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
@@ -794,14 +794,14 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest {
}
}
- protected String getRootFolder() {
+ static protected String getRootFolder() {
String eclipseFolder = "eclipse/";
if (Platform.getWS().equals(Platform.WS_COCOA))
eclipseFolder = "Eclipse.app/Contents/Eclipse/";
return eclipseFolder;
}
- protected String getExeFolder() {
+ static protected String getExeFolder() {
String eclipseFolder = "eclipse/";
if (Platform.getWS().equals(Platform.WS_COCOA))
eclipseFolder = "Eclipse.app/Contents/MacOS/";
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AbstractSharedInstallTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AbstractSharedInstallTest.java
index fd797ee77..e31bd1f3b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AbstractSharedInstallTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AbstractSharedInstallTest.java
@@ -47,7 +47,7 @@ public abstract class AbstractSharedInstallTest extends AbstractReconcilerTest {
}
protected File getBaseProfileRegistryFolder() {
- return new File(output, "eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/");
+ return new File(output, getRootFolder() + "p2/org.eclipse.equinox.p2.engine/profileRegistry/");
}
protected long[] getProfileTimestampsFromUser() {
@@ -241,7 +241,7 @@ public abstract class AbstractSharedInstallTest extends AbstractReconcilerTest {
}
public static void setupReadOnlyInstall() {
- readOnlyBase = new File(output, "eclipse");
+ readOnlyBase = new File(output, getRootFolder());
readOnlyBase.mkdirs();
assertTrue(readOnlyBase.canWrite());
setReadOnly(readOnlyBase, true);

Back to the top