From: Francis Ricci <francisjricci@gmail.com>
Date: Wed, 4 Oct 2017 17:30:28 +0000 (+0000)
Subject: [test] Fix append_path in the empty case
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0070218a51040245e43426997f6deb451b00c75;p=llvm

[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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@314915 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/lit/lit/llvm/config.py b/utils/lit/lit/llvm/config.py
index c3bdef318d6..b1ad5876099 100644
--- a/utils/lit/lit/llvm/config.py
+++ b/utils/lit/lit/llvm/config.py
@@ -107,9 +107,13 @@ class LLVMConfig(object):
             def norm(x):
                 return os.path.normcase(os.path.normpath(x))
 
-            current_paths = self.config.environment.get(variable, "")
-            current_paths = current_paths.split(os.path.pathsep)
-            paths = [norm(p) for p in current_paths]
+            current_paths = self.config.environment.get(variable, None)
+            if current_paths:
+                current_paths = current_paths.split(os.path.pathsep)
+                paths = [norm(p) for p in current_paths]
+            else:
+                paths = []
+
             # 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
             # need to iterate in reverse to end up with the original ordering.