[llvm-branch-commits] [libcxx] b0eab15 - [libc++][test] Propagate host environment to libc++ test suite

[Tom Stellard via llvm-branch-commits]

Author: Michał Górny
Date: 2022-08-05T01:04:08-07:00
New Revision: b0eab153405eaa29653f86ff13fa1832e0fbf991

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

LOG: [libc++][test] Propagate host environment to libc++ test suite

Propagate the complete host environment to the tests run via the new
testconfig. This ensures that all envvars needed e.g. for the compiler
to work correctly are present. This mimics the behavior explicitly
implemented in the legacy config.

https://github.com/llvm/llvm-project/issues/56816

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

(cherry picked from commit 39d4e169d35b59a39ad2fcfe1a568ba979079d83)

Added: 
    

Modified: 
    libcxx/test/libcxx/selftest/dsl/dsl.sh.py
    libcxx/utils/libcxx/test/newconfig.py

Removed: 
    


################################################################################
diff  --git a/libcxx/test/libcxx/selftest/dsl/dsl.sh.py b/libcxx/test/libcxx/selftest/dsl/dsl.sh.py
index 6ffedad2523fb..81fb60ac790fe 100644
--- a/libcxx/test/libcxx/selftest/dsl/dsl.sh.py
+++ b/libcxx/test/libcxx/selftest/dsl/dsl.sh.py
@@ -64,6 +64,7 @@ def setUp(self):
             params={})
 
         self.config = lit.TestingConfig.TestingConfig.fromdefaults(self.litConfig)
+        self.config.environment = dict(os.environ)
         self.config.test_source_root = SOURCE_ROOT
         self.config.test_exec_root = EXEC_PATH
         self.config.recursiveExpansionLimit = 10

diff  --git a/libcxx/utils/libcxx/test/newconfig.py b/libcxx/utils/libcxx/test/newconfig.py
index 2ac5cf239d63d..253f8e8e13947 100644
--- a/libcxx/utils/libcxx/test/newconfig.py
+++ b/libcxx/utils/libcxx/test/newconfig.py
@@ -6,6 +6,9 @@
 #
 #===----------------------------------------------------------------------===##
 
+import os
+
+
 def _getSubstitution(substitution, config):
   for (orig, replacement) in config.substitutions:
     if orig == substitution:
@@ -14,6 +17,7 @@ def _getSubstitution(substitution, config):
 
 def configure(parameters, features, config, lit_config):
   note = lambda s: lit_config.note("({}) {}".format(config.name, s))
+  config.environment = dict(os.environ)
 
   # Apply the actions supplied by parameters to the configuration first, since
   # parameters are things that we request explicitly and which might influence