commit 90ba831066426b52000e8510b4a59b3a7d07d7a1
author Lakshmi Shanmugam <lshanmug@in.ibm.com> Fri Jul 21 16:00:21 2017 +0530
committer Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com> Fri Jul 21 08:50:04 2017 -0400
tree 809f67ea3e7ab2ad2be85f9e29d39898f7f7e367
parent fa9faa7d1a3dc6abba29be9d57850651202aebfc

Bug 520012: Screenshots.takeScreenshot fails due to classpath error

Append bin/ to the classpath, so that the correct classpath is passed to
the ProcessBuilder


Change-Id: Ib423a4fb4ce9b50b669da138742935ecb5d9694a
Signed-off-by: Lakshmi Shanmugam <lshanmug@in.ibm.com>

bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java

diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java
index e8011dc..1ee8556 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java
@@ -79,6 +79,9 @@
         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)) {
+                cp += "bin" + File.separatorChar;
+            }
             String javaHome = System.getProperty("java.home");
             String javaExe = javaHome + File.separatorChar + "bin" + File.separatorChar + "java";
             if (File.separatorChar == '\\') {