Search for executable at old locations too in pde.build.tests

Follow-up on
- eclipse-pde#1841

Author: HannesWell

build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java

@@ -383,18 +383,29 @@ public static File findExecutable() throws IOException {
 				}
 			}
 		}
-
+		if (Platform.OS_MACOSX.equals(Platform.getOS())) {
+			// After https://bugs.eclipse.org/431116 and related changes, the install
+			// location on the Mac
+			// moved down two directories (from <folder-containing-Eclipse.app> to
+			// Eclipse.app/Contents/Eclipse).
+			baseLocation = baseLocation.getParentFile().getParentFile();
+		}
+		File fallback1 = new File(baseLocation.getParentFile(), "deltapack/eclipse");
+		executableLocation = findExecutable(fallback1);
+		if (executableLocation != null) {
+			return executableLocation;
+		}
 		if (Platform.OS.isMac()) {
 			// After https://bugs.eclipse.org/431116 and related changes, the install
 			// location on the Mac
 			// moved down two directories (from <folder-containing-Eclipse.app> to
 			// Eclipse.app/Contents/Eclipse).
-			baseLocation = baseLocation.getParentFile().getParentFile().getParentFile();
+			baseLocation = baseLocation.getParentFile();
 		}
-		File fallback = new File(baseLocation.getParentFile().getParentFile(), "deltapack/eclipse");
-		executableLocation = findExecutable(fallback);
-		assertNotNull("All attempts to find the executable failed including fallback to " + fallback.getAbsolutePath(),
-				executableLocation);
+		File fallback2 = new File(baseLocation.getParentFile().getParentFile(), "deltapack/eclipse");
+		executableLocation = findExecutable(fallback2);
+		assertNotNull("All attempts to find the executable failed including fallback to " + fallback1.getAbsolutePath()
+				+ " or to " + fallback2.getAbsolutePath(), executableLocation);
 		return executableLocation;
 	}