Merge branch 'master' of github.com:hermanjl/experiment-scripts

1 files changed, 3 insertions, 2 deletions

diff --git a/run/executable/executable.py b/run/executable/executable.py
index 263e305..e6f2003 100644
--- a/run/executable/executable.py
+++ b/run/executable/executable.py
@@ -6,9 +6,10 @@ from common import get_executable
 class Executable(object):
     '''Parent object that represents an executable for use in task-sets.'''
 
-    def __init__(self, exec_file, extra_args=None, stdout_file = None, stderr_file = None):
+    def __init__(self, exec_file, extra_args=None, stdout_file = None,
+                 stderr_file = None, cwd = None):
         self.exec_file = get_executable(exec_file)
-        self.cwd = None
+        self.cwd = cwd
         self.stdout_file = stdout_file
         self.stderr_file = stderr_file
         self.sp = None