Adjust to next release and assume the launcher is found

eclipse-pde · Dec 5, 2023 · 9c82b43 · 9c82b43
1 parent 6302182
commit 9c82b43
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/build/org.eclipse.pde.build.tests/pom.xml b/build/org.eclipse.pde.build.tests/pom.xml
@@ -7,10 +7,10 @@
 	<parent>
 		<groupId>org.eclipse.pde</groupId>
 		<artifactId>eclipse.pde.build</artifactId>
-		<version>4.30.0-SNAPSHOT</version>
+		<version>4.31.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.pde.build.tests</artifactId>
-	<version>1.4.200-SNAPSHOT</version>
+	<version>1.4.300-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>

diff --git a/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java b/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java
@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.pde.build.internal.tests;
 
+import static org.junit.Assume.assumeTrue;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -377,7 +379,10 @@ public static File findExecutable() throws IOException {
 			// Eclipse.app/Contents/Eclipse).
 			baseLocation = baseLocation.getParentFile().getParentFile();
 		}
-		executableLocation = findExecutable(new File(baseLocation.getParent(), "deltapack/eclipse"));
+		File fallback = new File(baseLocation.getParent(), "deltapack/eclipse");
+		executableLocation = findExecutable(fallback);
+		assumeTrue("All attempts to find the executable failed including fallback to " + fallback.getAbsolutePath(),
+				executableLocation != null);
 		return executableLocation;
 	}