Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ Houghton2008-10-20 17:55:32 +0000
committerDJ Houghton2008-10-20 17:55:32 +0000
commit6c3f78806941f5dfd1286a558bc069d698f79e03 (patch)
tree1b6cc8850ff4a15ccd6fe137bdd8079232d9aad5
parentbb673011932a8ff7f5a76210a2cd7c63a9c3c241 (diff)
downloadrt.equinox.p2-6c3f78806941f5dfd1286a558bc069d698f79e03.tar.gz
rt.equinox.p2-6c3f78806941f5dfd1286a558bc069d698f79e03.tar.xz
rt.equinox.p2-6c3f78806941f5dfd1286a558bc069d698f79e03.zip
Bug 251230 - [reconciler] Add test reconciler test suite to 3.4.x testsR34x_20081020
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java11
1 files changed, 6 insertions, 5 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 6761be390..419aebb34 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
@@ -73,9 +73,9 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest {
/*
* Run the given command.
*/
- private void run(String message, String command) {
+ private void run(String message, String[] commandArray) {
try {
- Process process = Runtime.getRuntime().exec(command, null, output);
+ Process process = Runtime.getRuntime().exec(commandArray, null, output);
process.waitFor();
} catch (IOException e) {
fail(message, e);
@@ -91,8 +91,8 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest {
String name = file.getName();
File gzFile = new File(output, name);
output.mkdirs();
- run(message, "cp " + file + " " + gzFile);
- run(message, "tar -zpxf" + gzFile);
+ run(message, new String[] {"cp", file.getAbsolutePath(), gzFile.getAbsolutePath()});
+ run(message, new String[] {"tar", "-zpxf", gzFile.getAbsolutePath()});
gzFile.delete();
}
@@ -281,7 +281,8 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest {
File exe = new File(root, "javaw.exe");
if (!exe.exists())
exe = new File(root, "java");
- run(message, "\"" + output.getAbsolutePath() + "/eclipse/eclipse\" --launcher.suppressErrors -nosplash -application org.eclipse.equinox.p2.reconciler.application -vm \"" + exe.getAbsolutePath() + "\"");
+ String[] command = new String[] {(new File(output, "eclipse/eclipse")).getAbsolutePath(), "--launcher.suppressErrors", "-nosplash", "-application", "org.eclipse.equinox.p2.reconciler.application", "-vm", exe.getAbsolutePath()};
+ run(message, command);
}
/*

Back to the top