summaryrefslogtreecommitdiffstats
path: root/libcxx/test
diff options
context:
space:
mode:
authorChris Bieneman <beanz@apple.com>2015-10-12 02:54:30 +0000
committerChris Bieneman <beanz@apple.com>2015-10-12 02:54:30 +0000
commit7c6a3b4c479228e6608382ea1ab90a621622ce4f (patch)
tree34d82d6ae915266c79bce498e0cc47b781fa16b1 /libcxx/test
parentdfce5a25cb18ecb8faf7d81a5215e3cd04818f32 (diff)
downloadbcm5719-llvm-7c6a3b4c479228e6608382ea1ab90a621622ce4f.tar.gz
bcm5719-llvm-7c6a3b4c479228e6608382ea1ab90a621622ce4f.zip
[Darwin] Reworking r250003 to use lit.util.capture instead of subprocess.
llvm-svn: 250007
Diffstat (limited to 'libcxx/test')
-rw-r--r--libcxx/test/libcxx/test/config.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/libcxx/test/libcxx/test/config.py b/libcxx/test/libcxx/test/config.py
index d71ab100fa2..e0f2f5b4941 100644
--- a/libcxx/test/libcxx/test/config.py
+++ b/libcxx/test/libcxx/test/config.py
@@ -6,7 +6,6 @@ import pkgutil
import re
import shlex
import sys
-import subprocess
import lit.Test # pylint: disable=import-error,no-name-in-module
import lit.util # pylint: disable=import-error,no-name-in-module
@@ -48,11 +47,8 @@ def getSysrootFlagsOnDarwin(config, lit_config):
# default system root path.
if 'darwin' in config.target_triple:
try:
- cmd = subprocess.Popen(['xcrun', '--show-sdk-path'],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- out, err = cmd.communicate()
- out = out.strip()
- res = cmd.wait()
+ out = lit.util.capture(['xcrun', '--show-sdk-path']).strip()
+ res = 0
except OSError:
res = -1
if res == 0 and out:
OpenPOWER on IntegriCloud