AwtScreenshot: Do not add "bin" to classpath eclipse-platform#1486

for "Eclipse-BundleShape: dir" in MANIFEST.MF fix "Error: Could not find or load main class org.eclipse.test.AwtScreenshot" eclipse-platform/eclipse.platform.swt#1486
jukzi · Oct 7, 2024 · 447290a · 447290a
1 parent a1d3873
commit 447290a
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/AwtScreenshot.java b/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/AwtScreenshot.java
@@ -78,7 +78,8 @@ public static void dumpAwtScreenshot(String screenshotFile) {
         try {
             URL location = AwtScreenshot.class.getProtectionDomain().getCodeSource().getLocation();
             String cp = location.toURI().getPath();
-            if (new File(cp).isDirectory() && !cp.endsWith(File.separatorChar + "bin" + File.separatorChar)) {
+			if (new File(cp).isDirectory() && !cp.endsWith(File.separatorChar + "bin" + File.separatorChar)
+					&& new File(cp + "bin" + File.separatorChar).isDirectory()) {
                 cp += "bin" + File.separatorChar;
             }
             String javaHome = System.getProperty("java.home");
@@ -120,11 +121,13 @@ public static void dumpAwtScreenshot(String screenshotFile) {
             if (done) {
                 int exitCode = process.exitValue();
                 if (exitCode != 0) {
-                    System.out.println("AwtScreenshot VM finished with exit code " + exitCode + ".");
+					new RuntimeException("AwtScreenshot VM finished with exit code " + exitCode + ".")
+							.printStackTrace();
                 }
             } else {
                 process.destroy();
-                System.out.println("Killed AwtScreenshot VM after " + TIMEOUT_SECONDS + " seconds.");
+				new RuntimeException("Killed AwtScreenshot VM after " + TIMEOUT_SECONDS + " seconds.")
+						.printStackTrace();
             }
         } catch (URISyntaxException | IOException e) {
             e.printStackTrace();