Skip to content

Commit b225b28

Browse files
committed
Use o.e.equinox.executable.feature.group in pde.build.tests
instead of the artificial (to be removed) unit 'org.eclipse.equinox.executable'. Because the p2.mirror-task that sets up the test environment in the test.xml is configured with 'followOnlyFilteredRequirements="true"' the redirection mechanism of the new definition of 'org.eclipse.equinox.executable' does not work. Additionally print where the executable was found, just for information. Should fix - #1884
1 parent 9a64872 commit b225b28

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

  • build/org.eclipse.pde.build.tests

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ public static File findExecutable() throws IOException {
362362

363363
executableLocation = findExecutable(baseLocation);
364364
if (executableLocation != null) {
365+
System.out.println("Found the executable at: " + executableLocation);
365366
return executableLocation;
366367
}
367368

@@ -377,6 +378,7 @@ public static File findExecutable() throws IOException {
377378
URI location = bundle.getLocation();
378379
executableLocation = findExecutable(URIUtil.toFile(URIUtil.append(location, "../..")));
379380
if (executableLocation != null) {
381+
System.out.println("Found the executable at: " + executableLocation);
380382
return executableLocation;
381383
}
382384
break;
@@ -393,6 +395,7 @@ public static File findExecutable() throws IOException {
393395
File fallback1 = new File(baseLocation.getParentFile(), "deltapack/eclipse");
394396
executableLocation = findExecutable(fallback1);
395397
if (executableLocation != null) {
398+
System.out.println("Found the executable at: " + executableLocation);
396399
return executableLocation;
397400
}
398401
if (Platform.OS.isMac()) {
@@ -406,6 +409,7 @@ public static File findExecutable() throws IOException {
406409
executableLocation = findExecutable(fallback2);
407410
assertNotNull("All attempts to find the executable failed including fallback to " + fallback1.getAbsolutePath()
408411
+ " or to " + fallback2.getAbsolutePath(), executableLocation);
412+
System.out.println("Found the executable at: " + executableLocation);
409413
return executableLocation;
410414
}
411415

build/org.eclipse.pde.build.tests/test.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
id="org.eclipse.jdt.feature.group"
151151
version="" />
152152
<iu
153-
id="org.eclipse.equinox.executable"
153+
id="org.eclipse.equinox.executable.feature.group"
154154
version="" />
155155
<iu
156156
id="org.eclipse.e4.rcp.feature.group"

0 commit comments

Comments
 (0)