wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[test] Fix append_path in the empty case 

Summary:
normpath() was being called on an empty string and appended to
the environment variable in the case where the environment variable
was unset. This led to ":." being appended to the path, since
normpath() of an empty string is '.', presumably to represent cwd.

Reviewers: zturner, sqlbyme, modocache

Subscribers: llvm-commits

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

llvm-svn: 314915
This commit is contained in:
Francis Ricci 2017-10-04 17:30:28 +00:00
parent 6fb55716e9
commit 954b94f5df
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/utils/lit/lit/llvm/config.py
View File

@ -107,9 +107,13 @@ class LLVMConfig(object):
def norm(x): def norm(x):
return os.path.normcase(os.path.normpath(x)) return os.path.normcase(os.path.normpath(x))
current_paths = self.config.environment.get(variable, "") current_paths = self.config.environment.get(variable, None)
if current_paths:
current_paths = current_paths.split(os.path.pathsep) current_paths = current_paths.split(os.path.pathsep)
paths = [norm(p) for p in current_paths] paths = [norm(p) for p in current_paths]
else:
paths = []
# If we are passed a list [a b c], then iterating this list forwards # If we are passed a list [a b c], then iterating this list forwards
# and adding each to the beginning would result in b c a. So we # and adding each to the beginning would result in b c a. So we
# need to iterate in reverse to end up with the original ordering. # need to iterate in reverse to end up with the original ordering.