summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Ng <anng.sw@gmail.com>2017-05-08 08:55:38 +0000
committerAndrew Ng <anng.sw@gmail.com>2017-05-08 08:55:38 +0000
commit9f9c41adecc5cf07da095246a7d1ccf3828c8c1e (patch)
tree1908827fc492102516c446817c1457869302086c
parentc96a84d813925c30f516030c259fac0b4375e6e3 (diff)
downloadbcm5719-llvm-9f9c41adecc5cf07da095246a7d1ccf3828c8c1e.tar.gz
bcm5719-llvm-9f9c41adecc5cf07da095246a7d1ccf3828c8c1e.zip
[Lit] Fix to prevent creation of "%SystemDrive%" directory on Windows.
This patch propogates the environment variable SYSTEMDRIVE on Windows when running the unit tests. This prevents the creation of a directory named "%SystemDrive%" when running the unit tests from FileSystemTest that use the function llvm::sys::fs::remove_directories which in turn uses SHFileOperationW. It is within SHFileOperationW that this environment variable may be used and if undefined causes the creation of a "%SystemDrive%" directory in the current directory. Differential Revision: https://reviews.llvm.org/D32910 llvm-svn: 302409
-rw-r--r--llvm/test/Unit/lit.cfg4
1 files changed, 4 insertions, 0 deletions
diff --git a/llvm/test/Unit/lit.cfg b/llvm/test/Unit/lit.cfg
index 30a5d3fab82..dac0bf829ba 100644
--- a/llvm/test/Unit/lit.cfg
+++ b/llvm/test/Unit/lit.cfg
@@ -43,6 +43,10 @@ if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir):
config.environment['PATH'] = os.path.pathsep.join((
config.shlibdir, config.environment['PATH']))
+# Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate.
+if sys.platform == 'win32' and 'SYSTEMDRIVE' in os.environ:
+ config.environment['SYSTEMDRIVE'] = os.environ['SYSTEMDRIVE']
+
###
# Check that the object root is known.
OpenPOWER on IntegriCloud