[libcxx] r258463 - Merging r258217:

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Thu Jan 21 19:08:10 2016
New Revision: 258463

URL: http://llvm.org/viewvc/llvm-project?rev=258463&view=rev
Log:
Merging r258217:
------------------------------------------------------------------------
r258217 | ericwf | 2016-01-19 16:06:29 -0700 (Tue, 19 Jan 2016) | 1 line

Fix enviroment variables when running shell scripts
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_38/test/libcxx/test/config.py

Modified: libcxx/branches/release_38/test/libcxx/test/config.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/libcxx/test/config.py?rev=258463&r1=258462&r2=258463&view=diff
==============================================================================
--- libcxx/branches/release_38/test/libcxx/test/config.py (original)
+++ libcxx/branches/release_38/test/libcxx/test/config.py Thu Jan 21 19:08:10 2016
@@ -606,7 +606,7 @@ class Configuration(object):
         for k, v in self.env.items():
             exec_env_str += ' %s=%s' % (k, v)
         # Configure run env substitution.
-        exec_str = ''
+        exec_str = exec_env_str
         if self.lit_config.useValgrind:
             exec_str = ' '.join(self.lit_config.valgrindArgs) + exec_env_str
         sub.append(('%exec', exec_str))