From 8804b79c2bfae8c2b6241059a7796fecdf0bcdaf Mon Sep 17 00:00:00 2001 From: "David L. Jones" Date: Thu, 6 Jul 2017 21:46:47 +0000 Subject: [PATCH] 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/llvm/trunk@307320 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Unit/lit.cfg | 5 +++-- test/lit.cfg | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg index dac0bf829ba..9da82f5f2c9 100644 --- a/test/Unit/lit.cfg +++ b/test/Unit/lit.cfg @@ -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__),'..','..') diff --git a/test/lit.cfg b/test/lit.cfg index ed1ba2d11b1..8ed9187aea7 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -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)