diff options
| author | Alexander Kurtakov | 2017-09-23 13:55:18 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2017-09-23 13:58:52 +0000 |
| commit | cf07fc23523312f1c90897df45b5d892efb7e991 (patch) | |
| tree | a614500f2bdce939ca5e3b56c6963529c652d299 | |
| parent | 625a656a844451738afa2062c16432e390ed63b1 (diff) | |
| download | rt.equinox.p2-I20170923-1500.tar.gz rt.equinox.p2-I20170923-1500.tar.xz rt.equinox.p2-I20170923-1500.zip | |
Bug 514333 - Preferences store access can lead to unattended workspaceI20170924-2000I20170923-1500
location initialization
Pass -Dosgi.dataAreaRequiresExplicitInit=false to p2 tests.
Change-Id: I514a7130e80725081c61ec100afb2a0051f64ae2
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/BaseChangeExtendedConfigured.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/BaseChangeExtendedConfigured.java index 95ab753d1..bef3493df 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/BaseChangeExtendedConfigured.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/BaseChangeExtendedConfigured.java @@ -66,7 +66,7 @@ public class BaseChangeExtendedConfigured extends BaseChange { List<String> command = new ArrayList<>(); Collections.addAll(command, new String[] {(new File(location == null ? output : location, getExeFolder() + "eclipse")).getAbsolutePath(), "--launcher.suppressErrors", "-nosplash", "-vm", exe.getAbsolutePath()}); Collections.addAll(command, args); - Collections.addAll(command, new String[] {"-vmArgs", "-Dosgi.checkConfiguration=true"}); + Collections.addAll(command, new String[] {"-vmArgs", "-Dosgi.checkConfiguration=true", "-Dosgi.dataAreaRequiresExplicitInit=false"}); if (extensions != null) { String extensionParameter = ""; for (File f : extensions) { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/BaseChangeExtendedConflicts.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/BaseChangeExtendedConflicts.java index 36384a947..24a0020cc 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/BaseChangeExtendedConflicts.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/BaseChangeExtendedConflicts.java @@ -66,7 +66,7 @@ public class BaseChangeExtendedConflicts extends BaseChange { List<String> command = new ArrayList<>(); Collections.addAll(command, new String[] {(new File(location == null ? output : location, getExeFolder() + "eclipse")).getAbsolutePath(), "--launcher.suppressErrors", "-nosplash", "-vm", exe.getAbsolutePath()}); Collections.addAll(command, args); - Collections.addAll(command, new String[] {"-vmArgs", "-Dosgi.checkConfiguration=true"}); + Collections.addAll(command, new String[] {"-vmArgs", "-Dosgi.checkConfiguration=true", "-Dosgi.dataAreaRequiresExplicitInit=false"}); if (extensions != null) { String extensionParameter = ""; for (File f : extensions) { |