Skip to content

Commit 1aae887

Browse files
HannesWelliils-hwellmann
authored andcommitted
Testing
1 parent 9cc11a4 commit 1aae887

3 files changed

Lines changed: 13 additions & 1 deletion

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<deltaPackDir>${project.build.directory}/deltapack/eclipse</deltaPackDir>
2323
<mirrorDir>${project.build.directory}/mirror-site</mirrorDir>
2424
<sdkProfile>SDKProfile</sdkProfile>
25+
<skipTests>false</skipTests>
26+
<!--debugPort>8003</debugPort-->
2527
</properties>
2628
<build>
2729
<plugins>

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,10 @@ public static File findExecutable() throws IOException {
360360

361361
File baseLocation = new File(Platform.getInstallLocation().getURL().getPath());
362362

363+
System.out.println("Search exe at baseLocation: " + baseLocation);
363364
executableLocation = findExecutable(baseLocation);
364365
if (executableLocation != null) {
366+
System.out.println("Found exe at 1: " + executableLocation);
365367
return executableLocation;
366368
}
367369

@@ -371,12 +373,14 @@ public static File findExecutable() throws IOException {
371373
BundleInfo[] bundles = manipulator
372374
.loadConfiguration(BundleHelper.getDefault().getBundle().getBundleContext(), null);
373375
// find a fragment for a platform we aren't
374-
String id = "org.eclipse.equinox.launcher.win32.win32.x86_64";
376+
String id = "org.eclipse.equinox.launcher.win32.win32.x86_64"; // FIXME: try for other platforms too?!
375377
for (BundleInfo bundle : bundles) {
376378
if (bundle.getSymbolicName().equals(id)) {
377379
URI location = bundle.getLocation();
380+
System.out.println("Search exe at bundle location: " + location);
378381
executableLocation = findExecutable(URIUtil.toFile(URIUtil.append(location, "../..")));
379382
if (executableLocation != null) {
383+
System.out.println("Found exe at 2: " + executableLocation);
380384
return executableLocation;
381385
}
382386
break;
@@ -390,9 +394,14 @@ public static File findExecutable() throws IOException {
390394
// moved down two directories (from <folder-containing-Eclipse.app> to
391395
// Eclipse.app/Contents/Eclipse).
392396
baseLocation = baseLocation.getParentFile().getParentFile().getParentFile();
397+
System.out.println("On Mac! Move baseLocation to: " + baseLocation);
393398
}
394399
File fallback = new File(baseLocation.getParentFile().getParentFile(), "deltapack/eclipse");
400+
System.out.println("Search exe at fallback: " + fallback);
395401
executableLocation = findExecutable(fallback);
402+
if (executableLocation != null) {
403+
System.out.println("Found exe at 4: " + executableLocation);
404+
}
396405
assertNotNull("All attempts to find the executable failed including fallback to " + fallback.getAbsolutePath(),
397406
executableLocation);
398407
return executableLocation;

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<tycho.scmUrl>scm:git:https://github.com/eclipse-pde/eclipse.pde.git</tycho.scmUrl>
3030
<failOnJavadocErrors>true</failOnJavadocErrors>
3131
<javadoc.excludePackageNames></javadoc.excludePackageNames>
32+
<!--skipTests>true</skipTests-->
3233
</properties>
3334

3435
<modules>

0 commit comments

Comments
 (0)