[libcxx-commits] [libcxx] 34ee3d9 - [libcxx] [test] Pass some windows environment variables through to test processes

[Martin Storsjö via libcxx-commits]

Author: Martin Storsjö
Date: 2021-03-02T22:39:14+02:00
New Revision: 34ee3d91a80cd58ee2ae5309b24ea1b72c3a7b79

URL: https://github.com/llvm/llvm-project/commit/34ee3d91a80cd58ee2ae5309b24ea1b72c3a7b79
DIFF: https://github.com/llvm/llvm-project/commit/34ee3d91a80cd58ee2ae5309b24ea1b72c3a7b79.diff

LOG: [libcxx] [test] Pass some windows environment variables through to test processes

Normally, the run.py wrapper script runs the child processes in
a clean environment, with only the environment variables available
that are passed via the --env parameter.

However, the COMSPEC and TEMP variables are kind of necessary when
running some tests; COMSPEC is necessary for finding the interpreter
when executing commands via std::system().

Before f1a96de1bc8db527b5eb820c36c17e275900ca2b, tests were executed
via an intermediate shell which implicitly readded the COMSPEC variable.

The TEMP variable allows temp files to be placed in a sensible
location; if unset, they're placed in the default temp fallback of
C:\Windows instead.

Differential Revision: https://reviews.llvm.org/D97452

Added: 
    

Modified: 
    libcxx/utils/run.py

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/run.py b/libcxx/utils/run.py
index f8951ee43f59..6d88e500b3f6 100755
--- a/libcxx/utils/run.py
+++ b/libcxx/utils/run.py
@@ -14,6 +14,8 @@
 """
 
 import argparse
+import os
+import platform
 import subprocess
 import sys
 
@@ -37,6 +39,14 @@ def main():
 
     # Extract environment variables into a dictionary
     env = {k : v  for (k, v) in map(lambda s: s.split('=', 1), args.env)}
+    if platform.system() == 'Windows':
+        # Pass some extra variables through on Windows:
+        # COMSPEC is needed for running subprocesses via std::system().
+        if 'COMSPEC' in os.environ:
+            env['COMSPEC'] = os.environ.get('COMSPEC')
+        # TEMP is needed for placing temp files in a sensible directory.
+        if 'TEMP' in os.environ:
+            env['TEMP'] = os.environ.get('TEMP')
 
     # Run the command line with the given environment in the execution directory.
     return subprocess.call(commandLine, cwd=args.execdir, env=env, shell=False)