Bug 416056 - Updating from I20130820-0800 to I20130827-0800 restarted many times with exceptions
- Add support to restart if requested
diff --git a/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF
index 5ba5133..8c18acc 100644
--- a/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Eclipse Core Tests Harness
Bundle-SymbolicName: org.eclipse.core.tests.harness; singleton:=true
-Bundle-Version: 3.9.0.qualifier
+Bundle-Version: 3.10.0.qualifier
Bundle-ClassPath: testharness.jar
Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
Bundle-Vendor: Eclipse.org
diff --git a/tests/org.eclipse.core.tests.harness/pom.xml b/tests/org.eclipse.core.tests.harness/pom.xml
index 4c62238..a0b832f 100644
--- a/tests/org.eclipse.core.tests.harness/pom.xml
+++ b/tests/org.eclipse.core.tests.harness/pom.xml
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.tests.harness</artifactId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/SessionTestRunner.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/SessionTestRunner.java
index aa74764..e2554b7 100644
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/SessionTestRunner.java
+++ b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/SessionTestRunner.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -268,6 +268,10 @@
IStatus outcome = Status.OK_STATUS;
try {
int returnCode = setup.run();
+ if (returnCode == 23) {
+ // asked to restart; for now just do this once
+ returnCode = setup.run();
+ }
if (returnCode != 0)
outcome = new Status(IStatus.WARNING, Platform.PI_RUNTIME, returnCode, "Process returned non-zero code: " + returnCode + "\n\tCommand: " + setup, null);
} catch (Exception e) {
