mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 03:02:36 +01:00
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 llvm-svn: 307320
This commit is contained in:
parent
64864662ab
commit
e88e36fbfd
@ -3,6 +3,7 @@
|
||||
# Configuration file for the 'lit' test runner.
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
import lit.formats
|
||||
|
||||
@ -75,8 +76,8 @@ if config.test_exec_root is None:
|
||||
lit_config.fatal('No site specific configuration available!')
|
||||
|
||||
# Get the source and object roots.
|
||||
llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
|
||||
llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
|
||||
llvm_src_root = subprocess.check_output(['llvm-config', '--src-root']).strip()
|
||||
llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).strip()
|
||||
|
||||
# Validate that we got a tree which points to here.
|
||||
this_src_root = os.path.join(os.path.dirname(__file__),'..','..')
|
||||
|
@ -6,6 +6,7 @@ import os
|
||||
import sys
|
||||
import re
|
||||
import platform
|
||||
import subprocess
|
||||
|
||||
import lit.util
|
||||
import lit.formats
|
||||
@ -150,8 +151,8 @@ if config.test_exec_root is None:
|
||||
lit_config.fatal('No site specific configuration available!')
|
||||
|
||||
# Get the source and object roots.
|
||||
llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
|
||||
llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
|
||||
llvm_src_root = subprocess.check_output(['llvm-config', '--src-root']).strip()
|
||||
llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).strip()
|
||||
|
||||
# Validate that we got a tree which points to here.
|
||||
this_src_root = os.path.dirname(config.test_source_root)
|
||||
|
Loading…
Reference in New Issue
Block a user