diff options
Diffstat (limited to 'libcxx/utils/libcxx/test/format.py')
| -rw-r--r-- | libcxx/utils/libcxx/test/format.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/utils/libcxx/test/format.py b/libcxx/utils/libcxx/test/format.py index f8d0a85545d..55f179a20e1 100644 --- a/libcxx/utils/libcxx/test/format.py +++ b/libcxx/utils/libcxx/test/format.py @@ -154,7 +154,7 @@ class LibcxxTestFormat(object): # We can't run ShTest tests with a executor yet. # For now, bail on trying to run them return lit.Test.UNSUPPORTED, 'ShTest format not yet supported' - test.config.environment = dict(self.exec_env) + test.config.environment = self.executor.merge_environments(os.environ, self.exec_env) return lit.TestRunner._runShTest(test, lit_config, self.execute_external, script, tmpBase) |
