[libcxx-commits] [PATCH] D97452: [libcxx] [test] Pass some windows environment variables through to test processes

[Martin Storsjö via Phabricator via libcxx-commits]

mstorsjo created this revision.
mstorsjo added a reviewer: libc++.
Herald added a subscriber: arichardson.
mstorsjo requested review of this revision.
Herald added a project: libc++.
Herald added 1 blocking reviewer(s): libc++.

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 <https://reviews.llvm.org/rGf1a96de1bc8db527b5eb820c36c17e275900ca2b>, 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.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D97452

Files:
  libcxx/utils/run.py


Index: libcxx/utils/run.py
===================================================================
--- libcxx/utils/run.py
+++ libcxx/utils/run.py
@@ -14,6 +14,8 @@
 """
 
 import argparse
+import os
+import platform
 import subprocess
 import sys
 
@@ -37,6 +39,14 @@
 
     # 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)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D97452.326314.patch
Type: text/x-patch
Size: 984 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210225/af78afa1/attachment-0001.bin>