From ee48887d9d3e946ba892b7f9618257fe31b929dd Mon Sep 17 00:00:00 2001 From: Alvaro Sanchez-Leon Date: Mon, 2 May 2016 13:23:09 -0400 Subject: [PATCH] Bug 489750: [Standalone] does not set working directory of the target process correctly Change-Id: Ia6d9f1ee64b573d2cba3bba780c2b8c90fe0757d Signed-off-by: Alvaro Sanchez-Leon --- .../internal/debug/application/DebugExecutable.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/DebugExecutable.java b/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/DebugExecutable.java index 2ca1f22a963..7299e4307cf 100644 --- a/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/DebugExecutable.java +++ b/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/DebugExecutable.java @@ -296,10 +296,15 @@ public class DebugExecutable { wc.setAttribute( ICDTLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String) null); - if (arguments != null) - wc.setAttribute( - ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, - arguments); + + if (arguments != null) { + wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, arguments); + } + + // Use the PWD as the working directory for the application being launched + wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, + System.getProperty("user.dir")); //$NON-NLS-1$ + if (save) { config = wc.doSave(); } else {