generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the PrefixExecutor.

Browse Source 
The PrefixExecutor wasn't passing the exe_path down the chain, so the
command was overriding that, the work_dir was being passed as the
command, and so on.

I've cleaned up a few pylint issues while I was here.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@231496 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Albert 2015-03-06 18:35:45 +00:00
parent ab2b9f526c
commit ca27dd0a23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/libcxx/test/executor.py
View File

@ -1,6 +1,6 @@
import os import os
import tracing from libcxx.test import tracing
from lit.util import executeCommand # pylint: disable=import-error from lit.util import executeCommand # pylint: disable=import-error
@ -50,7 +50,8 @@ class PrefixExecutor(Executor):
def run(self, exe_path, cmd=None, work_dir='.', env=None): def run(self, exe_path, cmd=None, work_dir='.', env=None):
cmd = cmd or [exe_path] cmd = cmd or [exe_path]
return self.chain.run(self.commandPrefix + cmd, work_dir, env=env) return self.chain.run(exe_path, self.commandPrefix + cmd, work_dir,
env=env)
class PostfixExecutor(Executor): class PostfixExecutor(Executor):
@ -132,6 +133,9 @@ class SSHExecutor(Executor):
pass pass
def run(self, exe_path, cmd=None, work_dir='.', env=None): def run(self, exe_path, cmd=None, work_dir='.', env=None):
if work_dir != '.':
raise NotImplementedError(
'work_dir arg is not supported for SSHExecutor')
target_exe_path = None target_exe_path = None
target_cwd = None target_cwd = None
try: try:
@ -163,4 +167,3 @@ class SSHExecutor(Executor):
if remote_work_dir != '.': if remote_work_dir != '.':
remote_cmd = 'cd ' + remote_work_dir + ' && ' + remote_cmd remote_cmd = 'cd ' + remote_work_dir + ' && ' + remote_cmd
return self.local_run(ssh_cmd + [remote_cmd]) return self.local_run(ssh_cmd + [remote_cmd])