Print environment variables that were specified when executing commands

Author: ahoppen

Utilities/build-script-helper.py

@@ -8,7 +8,7 @@
 import shutil
 import subprocess
 import sys
-from typing import Dict, List, Optional
+from typing import Dict, List
 
 
 # -----------------------------------------------------------------------------
@@ -27,23 +27,41 @@ def escapeCmdArg(arg: str) -> str:
         return arg
 
 
-def check_call(cmd: List[str], env: Optional[Dict[str, str]], cwd: Optional[str] = None, verbose: bool = False):
+def print_cmd(cmd: List[str], additional_env: Dict[str, str]) -> None:
+    env_str = " ".join([f"{key}={escapeCmdArg(str(value))}" for (key, value) in additional_env.items()])
+    command_str = " ".join([escapeCmdArg(str(arg)) for arg in cmd])
+    print(f"{env_str} {command_str}")
+
+
+def env_with_additional_env(additional_env: Dict[str, str]) -> Dict[str, str]:
+    env = dict(os.environ)
+    for (key, value) in additional_env.items():
+        env[key] = str(value)
+    return env
+
+
+def check_call(cmd: List[str], additional_env: Dict[str, str] = {}, verbose: bool = False) -> None:
     if verbose:
-        print(" ".join([escapeCmdArg(arg) for arg in cmd]))
-    return subprocess.check_call(cmd, cwd=cwd, env=env, stderr=subprocess.STDOUT)
+        print_cmd(cmd=cmd, additional_env=additional_env)
+
+    subprocess.check_call(cmd, env=env_with_additional_env(additional_env), stderr=subprocess.STDOUT)
+
+
+def check_output(cmd: List[str], additional_env: Dict[str, str] = {}, verbose: bool = False) -> str:
+    if verbose:
+        print_cmd(cmd=cmd, additional_env=additional_env)
+    return subprocess.check_output(cmd, env=env_with_additional_env(additional_env), stderr=subprocess.STDOUT, encoding='utf-8')
 
 # -----------------------------------------------------------------------------
 # SwiftPM wrappers
 
 
-def swiftpm_bin_path(swift_exec: str, swiftpm_args: List[str], env: Optional[Dict[str, str]], verbose: bool = False) -> str:
+def swiftpm_bin_path(swift_exec: str, swiftpm_args: List[str], additional_env: Dict[str, str], verbose: bool = False) -> str:
     """
     Return the path of the directory that contains the binaries produced by this package.
     """
     cmd = [swift_exec, 'build', '--show-bin-path'] + swiftpm_args
-    if verbose:
-        print(" ".join([escapeCmdArg(arg) for arg in cmd]))
-    return subprocess.check_output(cmd, env=env, universal_newlines=True).strip()
+    return check_output(cmd, additional_env=additional_env, verbose=verbose).strip()
 
 
 def get_build_target(swift_exec: str, args: argparse.Namespace) -> str:
@@ -132,10 +150,12 @@ def get_swiftpm_environment_variables(swift_exec: str, args: argparse.Namespace)
     'swift test' invocation.
     """
 
-    env = dict(os.environ)
-    # Set the toolchain used in tests at runtime
-    env['SOURCEKIT_TOOLCHAIN_PATH'] = args.toolchain
-    env['INDEXSTOREDB_TOOLCHAIN_BIN_PATH'] = args.toolchain
+    env = {
+        # Set the toolchain used in tests at runtime
+        'SOURCEKIT_TOOLCHAIN_PATH': args.toolchain,
+        'INDEXSTOREDB_TOOLCHAIN_BIN_PATH': args.toolchain,
+        'SWIFT_EXEC': f'{swift_exec}c'
+    }
     # Use local dependencies (i.e. checked out next sourcekit-lsp).
     if not args.no_local_deps:
         env['SWIFTCI_USE_LOCAL_DEPS'] = "1"
@@ -155,8 +175,6 @@ def get_swiftpm_environment_variables(swift_exec: str, args: argparse.Namespace)
     if args.action == 'test' and not args.skip_long_tests:
         env['SOURCEKIT_LSP_ENABLE_LONG_TESTS'] = '1'
 
-    env['SWIFT_EXEC'] = '%sc' % (swift_exec)
-
     return env
 
 
@@ -165,19 +183,19 @@ def build_single_product(product: str, swift_exec: str, args: argparse.Namespace
     Build one product in the package
     """
     swiftpm_args = get_swiftpm_options(swift_exec, args)
-    env = get_swiftpm_environment_variables(swift_exec, args)
+    additional_env = get_swiftpm_environment_variables(swift_exec, args)
     cmd = [swift_exec, 'build', '--product', product] + swiftpm_args
-    check_call(cmd, env=env, verbose=args.verbose)
+    check_call(cmd, additional_env=additional_env, verbose=args.verbose)
 
 
 def run_tests(swift_exec: str, args: argparse.Namespace) -> None:
     """
     Run all tests in the package
     """
     swiftpm_args = get_swiftpm_options(swift_exec, args)
-    env = get_swiftpm_environment_variables(swift_exec, args)
+    additional_env = get_swiftpm_environment_variables(swift_exec, args)
 
-    bin_path = swiftpm_bin_path(swift_exec, swiftpm_args, env)
+    bin_path = swiftpm_bin_path(swift_exec, swiftpm_args, additional_env=additional_env)
     tests = os.path.join(bin_path, 'sk-tests')
     print('Cleaning ' + tests)
     shutil.rmtree(tests, ignore_errors=True)
@@ -188,23 +206,23 @@ def run_tests(swift_exec: str, args: argparse.Namespace) -> None:
         '--disable-testable-imports',
         '--test-product', 'SourceKitLSPPackageTests'
     ] + swiftpm_args
-    check_call(cmd, env=env, verbose=args.verbose)
+    check_call(cmd, additional_env=additional_env, verbose=args.verbose)
 
 
 def install_binary(exe: str, source_dir: str, install_dir: str, verbose: bool) -> None:
     cmd = ['rsync', '-a', os.path.join(source_dir, exe), install_dir]
-    check_call(cmd, env=None, verbose=verbose)
+    check_call(cmd, verbose=verbose)
 
 
 def install(swift_exec: str, args: argparse.Namespace) -> None:
     swiftpm_args = get_swiftpm_options(swift_exec, args)
-    env = get_swiftpm_environment_variables(swift_exec, args)
+    additional_env = get_swiftpm_environment_variables(swift_exec, args)
 
-    bin_path = swiftpm_bin_path(swift_exec, swiftpm_args, env)
+    bin_path = swiftpm_bin_path(swift_exec, swiftpm_args=swiftpm_args, additional_env=additional_env)
     swiftpm_args += ['-Xswiftc', '-no-toolchain-stdlib-rpath']
     check_call([
         swift_exec, 'build'
-    ] + swiftpm_args, env=env)
+    ] + swiftpm_args, additional_env=additional_env)
 
     if not args.install_prefixes:
         args.install_prefixes = [args.toolchain]