Change remaining references to lit.util.capture to use subprocess.check_output.

[dlj]

Summary

The capture() function was removed in r306625. This should fix PGO breakages
reported by Michael Zolotukhin.

[dlj]

Fix diffs.

cfe/trunk/test/Unit/lit.cfg

 # -*- Python -*-
 
 # Configuration file for the 'lit' test runner.
 
 import os
 import platform
+import subprocess
 
 import lit.formats
 import lit.util
 
 # name: The name of this test suite.
 config.name = 'Clang-Unit'
 
 # suffixes: A list of file extensions to treat as test files.
if config.test_exec_root is None:
     # build situation. This means knowing how to invoke the build system
     # though, and I decided it was too much magic.
 
     llvm_config = lit.util.which('llvm-config', config.environment['PATH'])
     if not llvm_config:
         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()
     clang_src_root = os.path.join(llvm_src_root, "tools", "clang")
     clang_obj_root = os.path.join(llvm_obj_root, "tools", "clang")
 
     # Validate that we got a tree which points to here, using the standard
     # tools/clang layout.
     this_src_root = os.path.join(os.path.dirname(__file__),'..','..')
     if os.path.realpath(clang_src_root) != os.path.realpath(this_src_root):
         lit_config.fatal('No site specific configuration available!')

cfe/trunk/test/lit.cfg

if config.test_exec_root is None:
     # and I decided it was too much magic. We should solve this by just having
     # the .cfg files generated during the configuration step.
 
     llvm_config = lit.util.which('llvm-config', config.environment['PATH'])
     if not llvm_config:
         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()
     clang_src_root = os.path.join(llvm_src_root, "tools", "clang")
     clang_obj_root = os.path.join(llvm_obj_root, "tools", "clang")
 
     # Validate that we got a tree which points to here, using the standard
     # tools/clang layout.
     this_src_root = os.path.dirname(config.test_source_root)
     if os.path.realpath(clang_src_root) != os.path.realpath(this_src_root):
         lit_config.fatal('No site specific configuration available!')

lld/trunk/test/lit.cfg

if config.test_exec_root is None:
     # and I decided it was too much magic. We should solve this by just having
     # the .cfg files generated during the configuration step.
 
     llvm_config = lit.util.which('llvm-config', config.environment['PATH'])
     if not llvm_config:
         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()
     lld_src_root = os.path.join(llvm_src_root, "tools", "lld")
     lld_obj_root = os.path.join(llvm_obj_root, "tools", "lld")
 
     # Validate that we got a tree which points to here, using the standard
     # tools/lld layout.
     this_src_root = os.path.dirname(config.test_source_root)
     if os.path.realpath(lld_src_root) != os.path.realpath(this_src_root):
         lit_config.fatal('No site specific configuration available!')

lldb/trunk/lit/lit.cfg

if config.test_exec_root is None:
     # and I decided it was too much magic. We should solve this by just having
     # the .cfg files generated during the configuration step.
 
     llvm_config = lit.util.which('llvm-config', config.environment['PATH'])
     if not llvm_config:
         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()
     lldb_src_root = os.path.join(llvm_src_root, "tools", "lldb")
     lldb_obj_root = os.path.join(llvm_obj_root, "tools", "lldb")
 
     # Validate that we got a tree which points to here, using the standard
     # tools/lldb layout.
     this_src_root = os.path.dirname(config.test_source_root)
     if os.path.realpath(lldb_src_root) != os.path.realpath(this_src_root):
         lit_config.fatal('No site specific configuration available!')

 if not os.path.exists(config.cc):
     config.cc = lit.util.which(config.cc, config.environment['PATH'])
 
 if not os.path.exists(config.cxx):
     config.cxx = lit.util.which(config.cxx, config.environment['PATH'])
 
 if platform.system() in ['Darwin']:
     try:
-        out = lit.util.capture(['xcrun', '--show-sdk-path']).strip()
+        out = subprocess.check_output(['xcrun', '--show-sdk-path']).strip()
         res = 0
     except OSError:
         res = -1
     if res == 0 and out:
         sdk_path = out
         lit_config.note('using SDKROOT: %r' % sdk_path)
         config.cc += " -isysroot %s" % sdk_path
         config.cxx += " -isysroot %s" % sdk_path

llvm/trunk/test/Unit/lit.cfg

 # -*- Python -*-
 
 # Configuration file for the 'lit' test runner.
 
 import os
+import subprocess
 
 import lit.formats
 
 # name: The name of this test suite.
 config.name = 'LLVM-Unit'
 
 # suffixes: A list of file extensions to treat as test files.
 config.suffixes = []
if config.test_exec_root is None:
     # build situation. This means knowing how to invoke the build system
     # though, and I decided it was too much magic.
 
     llvm_config = lit.util.which('llvm-config', config.environment['PATH'])
     if not llvm_config:
         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__),'..','..')
     if os.path.realpath(llvm_src_root) != os.path.realpath(this_src_root):
         lit_config.fatal('No site specific configuration available!')
 
     # Check that the site specific configuration exists.
     site_cfg = os.path.join(llvm_obj_root, 'test', 'Unit', 'lit.site.cfg')
     if not os.path.exists(site_cfg):
         lit_config.fatal('No site specific configuration available!')
 
     # Okay, that worked. Notify the user of the automagic, and reconfigure.
     lit_config.note('using out-of-tree build at %r' % llvm_obj_root)
     lit_config.load_config(config, site_cfg)
     raise SystemExit

llvm/trunk/test/lit.cfg

 # -*- Python -*-
 
 # Configuration file for the 'lit' test runner.
 
 import os
 import sys
 import re
 import platform
+import subprocess
 
 import lit.util
 import lit.formats
 
 # name: The name of this test suite.
 config.name = 'LLVM'
 
 # Tweak PATH for Win32 to decide to use bash.exe or not.
if config.test_exec_root is None:
     # build situation. This means knowing how to invoke the build system
     # though, and I decided it was too much magic.
 
     llvm_config = lit.util.which('llvm-config', config.environment['PATH'])
     if not llvm_config:
         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)
     if os.path.realpath(llvm_src_root) != os.path.realpath(this_src_root):
         lit_config.fatal('No site specific configuration available!')
 
     # Check that the site specific configuration exists.
     site_cfg = os.path.join(llvm_obj_root, 'test', 'lit.site.cfg')