Skip to content

Commit b3bfd38

Browse files
committed
Change remaining references to lit.util.capture to use subprocess.check_output.
Summary: The capture() function was removed in r306625. This should fix PGO breakages reported by Michael Zolotukhin. Reviewers: mzolotukhin Subscribers: sanjoy, llvm-commits Differential Revision: https://reviews.llvm.org/D35088 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@307320 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 3dea30d commit b3bfd38

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

test/Unit/lit.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import os
66
import platform
7+
import subprocess
78

89
import lit.formats
910
import lit.util
@@ -65,8 +66,8 @@ if config.test_exec_root is None:
6566
lit_config.fatal('No site specific configuration available!')
6667

6768
# Get the source and object roots.
68-
llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
69-
llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
69+
llvm_src_root = subprocess.check_output(['llvm-config', '--src-root']).strip()
70+
llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).strip()
7071
clang_src_root = os.path.join(llvm_src_root, "tools", "clang")
7172
clang_obj_root = os.path.join(llvm_obj_root, "tools", "clang")
7273

test/lit.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ if config.test_exec_root is None:
148148
lit_config.fatal('No site specific configuration available!')
149149

150150
# Get the source and object roots.
151-
llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
152-
llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
151+
llvm_src_root = subprocess.check_output(['llvm-config', '--src-root']).strip()
152+
llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).strip()
153153
clang_src_root = os.path.join(llvm_src_root, "tools", "clang")
154154
clang_obj_root = os.path.join(llvm_obj_root, "tools", "clang")
155155

0 commit comments

Comments
 (0)