From 9c82b43cd8bd738f22e515da7244da2908f91beb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Mon, 4 Dec 2023 19:55:55 +0100
Subject: [PATCH] Adjust to next release  and assume the launcher is found

---
 build/org.eclipse.pde.build.tests/pom.xml                  | 4 ++--
 .../src/org/eclipse/pde/build/internal/tests/Utils.java    | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/org.eclipse.pde.build.tests/pom.xml b/build/org.eclipse.pde.build.tests/pom.xml
index 6d493bc02c..5aedd06002 100644
--- 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
index 0a39e1f549..48fd9c9ed3 100644
--- 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;
 	}