[utils] Switch random scripts to shell.capture.

 - This eliminates the last uses of `SwiftBuildSupport.check_output`.

Author: ddunbar

utils/SwiftBuildSupport.py

@@ -18,7 +18,6 @@
     import configparser as ConfigParser
 
 import os
-import subprocess
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), 'swift_build_support'))
@@ -69,22 +68,6 @@ def _get_default_source_root():
     "SWIFT_BUILD_ROOT", os.path.join(SWIFT_SOURCE_ROOT, "build"))
 
 
-def check_output(args, print_command=False, verbose=False):
-    if print_command:
-        print(os.getcwd() + "$ " + shell.quote_command(args))
-        sys.stdout.flush()
-    try:
-        return subprocess.check_output(args)
-    except subprocess.CalledProcessError as e:
-        diagnostics.fatal(
-            "command terminated with a non-zero exit status " +
-            str(e.returncode) + ", aborting")
-    except OSError as e:
-        diagnostics.fatal(
-            "could not execute '" + shell.quote_command(args) +
-            "': " + e.strerror)
-
-
 def _load_preset_files_impl(preset_file_names, substitutions={}):
     config = ConfigParser.SafeConfigParser(substitutions, allow_no_value=True)
     if config.read(preset_file_names) == []:

utils/profdata_merge/process.py

@@ -19,18 +19,16 @@
 from multiprocessing import Process
 
 
-# hack to import SwiftBuildSupport and swift_build_support
-parent_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..')
-sys.path.append(parent_dir)
-support_dir = os.path.join(parent_dir, 'swift_build_support')
-sys.path.append(support_dir)
+# Allow importing swift_build_support.
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..',
+                             'swift_build_support'))
 from swift_build_support import shell  # noqa (E402)
 from swift_build_support.toolchain import host_toolchain  # noqa (E402)
-from SwiftBuildSupport import check_output  # noqa (E402)
 
 toolchain = host_toolchain()
 LLVM_PROFDATA_PATH = toolchain.llvm_profdata
-_profdata_help = check_output([LLVM_PROFDATA_PATH, 'merge', '-help'])
+_profdata_help = shell.capture([LLVM_PROFDATA_PATH, 'merge', '-help'],
+                               print_command=False)
 LLVM_PROFDATA_SUPPORTS_SPARSE = 'sparse' in _profdata_help
 
 

utils/update-checkout

@@ -19,7 +19,6 @@ sys.path.append(os.path.dirname(__file__))
 
 from SwiftBuildSupport import (
     SWIFT_SOURCE_ROOT,
-    check_output,
 )  # noqa (E402 module level import not at top of file)
 
 sys.path.append(os.path.join(os.path.dirname(__file__), 'swift_build_support'))
@@ -95,7 +94,8 @@ def update_working_copy(repo_path, branch):
     print("--- Updating '" + repo_path + "' ---")
     with shell.pushd(repo_path, dry_run=False, print_command=False):
         if branch:
-            status = check_output(['git', 'status', '--porcelain'])
+            status = shell.capture(['git', 'status', '--porcelain'],
+                                   print_command=False)
             if status:
                 print("Please, commit your changes.")
                 print(status)