[libcxx] [test] Fix running tests on macOS with python3
Summary: The result of subprocess.check_output() is bytes in python3 which we need to convert to str(). Simplify this by using the executeCommand() helper. Reviewers: ldionne, EricWF Reviewed By: ldionne Subscribers: christof, libcxx-commits Differential Revision: https://reviews.llvm.org/D54522 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@346878 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -15,6 +15,8 @@ import re
|
|||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
from libcxx.util import executeCommand
|
||||||
|
|
||||||
class DefaultTargetInfo(object):
|
class DefaultTargetInfo(object):
|
||||||
def __init__(self, full_config):
|
def __init__(self, full_config):
|
||||||
self.full_config = full_config
|
self.full_config = full_config
|
||||||
@@ -127,14 +129,13 @@ class DarwinLocalTI(DefaultTargetInfo):
|
|||||||
cmd = ['xcrun', '--sdk', name, '--show-sdk-path']
|
cmd = ['xcrun', '--sdk', name, '--show-sdk-path']
|
||||||
else:
|
else:
|
||||||
cmd = ['xcrun', '--show-sdk-path']
|
cmd = ['xcrun', '--show-sdk-path']
|
||||||
try:
|
out, err, exit_code = executeCommand(cmd)
|
||||||
out = subprocess.check_output(cmd).strip()
|
if exit_code != 0:
|
||||||
res = 0
|
self.full_config.lit_config.warning("Could not determine macOS SDK path! stderr was " + err)
|
||||||
except OSError:
|
if exit_code == 0 and out:
|
||||||
res = -1
|
sdk_path = out.strip()
|
||||||
if res == 0 and out:
|
|
||||||
sdk_path = out
|
|
||||||
self.full_config.lit_config.note('using SDKROOT: %r' % sdk_path)
|
self.full_config.lit_config.note('using SDKROOT: %r' % sdk_path)
|
||||||
|
assert isinstance(sdk_path, str)
|
||||||
flags += ["-isysroot", sdk_path]
|
flags += ["-isysroot", sdk_path]
|
||||||
|
|
||||||
def add_cxx_link_flags(self, flags):
|
def add_cxx_link_flags(self, flags):
|
||||||
|
|||||||
Reference in New Issue
Block a user