mirror of
https://github.com/darlinghq/darling-libcxx.git
synced 2025-02-20 03:40:49 +00:00
Use lit.util.executeCommand instead of our own version
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@222717 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
e6e69df598
commit
bd0000808d
22
test/lit.cfg
22
test/lit.cfg
@ -36,24 +36,6 @@ class LibcxxTestFormat(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:
|
||||
@ -121,7 +103,7 @@ class LibcxxTestFormat(lit.formats.FileBasedTest):
|
||||
if use_verify:
|
||||
cmd += ['-Xclang', '-verify']
|
||||
|
||||
out, err, rc = self.execute_command(cmd)
|
||||
out, err, rc = lit.util.executeCommand(cmd)
|
||||
return cmd, out, err, rc
|
||||
|
||||
def _clean(self, exec_path):
|
||||
@ -136,7 +118,7 @@ class LibcxxTestFormat(lit.formats.FileBasedTest):
|
||||
cmd.append(exec_path)
|
||||
if lit_config.useValgrind:
|
||||
cmd = lit_config.valgrindArgs + cmd
|
||||
out, err, exitCode = self.execute_command(cmd, in_dir)
|
||||
out, err, exitCode = lit.util.executeCommand(cmd, cwd=in_dir)
|
||||
return cmd, out, err, exitCode
|
||||
|
||||
def _evaluate_test(self, test, use_verify, lit_config):
|
||||
|
Loading…
x
Reference in New Issue
Block a user