From 11d1f9910f016041a13ec2cdfaabbd706fc9827f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Wed, 18 Sep 2024 07:37:43 +0200 Subject: [PATCH] [test] jdi: fix AutomatedSuite dir classpath Do not add "bin" to classpath for "Eclipse-BundleShape: dir" in MANIFEST.MF --- .../tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java index 3e79fc883d..42f0a282b7 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java +++ b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java @@ -124,7 +124,8 @@ public AbstractJDITest(String name) { try { String cp = MainClass.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath(); System.out.println("MainClass path=" + cp); - 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; } fClassPath = new File(cp).getAbsolutePath();