maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use lit.util.executeCommand instead of our own version 

llvm-svn: 222718
This commit is contained in:
Eric Fiselier 2014-11-25 03:06:31 +00:00
parent e620b5eaa6
commit 17b1568fc4
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libcxxabi/test/lit.cfg
View File

@ -28,24 +28,6 @@ class LibcxxabiTestFormat(lit.formats.FileBasedTest):
self.ld_flags = list(ld_flags)
self.exec_env = dict(exec_env)
def execute_command(self, command, in_dir=None):
kwargs = {
'stdin' :subprocess.PIPE,
'stdout':subprocess.PIPE,
'stderr':subprocess.PIPE,
}
if in_dir:
kwargs['cwd'] = in_dir
p = subprocess.Popen(command, **kwargs)
out,err = p.communicate()
exitCode = p.wait()
# Detect Ctrl-C in subprocess.
if exitCode == -signal.SIGINT:
raise KeyboardInterrupt
return out, err, exitCode
def execute(self, test, lit_config):
while True:
try:
@ -111,7 +93,7 @@ class LibcxxabiTestFormat(lit.formats.FileBasedTest):
compile_cmd = [self.cxx_under_test, '-o', exec_path,
source_path] + self.cpp_flags + self.ld_flags
cmd = compile_cmd
out, err, exitCode = self.execute_command(cmd)
out, err, exitCode = lit.util.executeCommand(cmd)
if exitCode != 0:
report = """Command: %s\n""" % ' '.join(["'%s'" % a
for a in cmd])
@ -131,7 +113,7 @@ class LibcxxabiTestFormat(lit.formats.FileBasedTest):
cmd.append(exec_path)
if lit_config.useValgrind:
cmd = lit_config.valgrindArgs + cmd
out, err, exitCode = self.execute_command(cmd, source_dir)
out, err, exitCode = lit.util.executeCommand(cmd, cwd=source_dir)
if exitCode != 0:
report = """Compiled With: %s\n""" % \
' '.join(["'%s'" % a for a in compile_cmd])